How to recover from bad merge

[Kevin Ivey]

I am using SourceTree to manage a BitBucket Git repository. I did a merge a couple weeks ago, but I must have goofed it up. I do not see any of the changes from the merged branch in master. When I try to merge the branch again, no changes are getting merged. I have made multiple commits in the master branch since this merge. How can I redo this merge without losing the work done in the subsequent commits.

[Seth]

You might try creating a branch off of master on the commit prior to the original (faulty) merge, then merge from your other branch into this new one, and see what that branch looks like after the merge.

[Kevin Ivey]

None of the subsequent commits refer the files that should have been merged. What is also odd is that the commit created by the merge does not include any of the files that I would expect to find.

[Seth]

I'm not sure we can tell you how to fix it without a more specific idea of what went wrong. Did one of the subsequent commits somehow revert your changes?