0

I have a branch that is currently at the same commit as master. Another developer has just merged master into their branch and resolved all conflicts, but they have NOT done the opposite yet: merge their branch into master.

When I merge their branch into mine I still get all the conflicts that they resolved in their last merge commit. How can I tell git to use the resolutions that the other developer has already done?

mnzaki
  • 3
  • 1
  • 1
    I may have found an answer, but I'm not sure if this does what I think it does: `git merge -s recursive -X theirs OtherGuysBranchWithResolutions` Does this actually do what I need or are there gotchas? – mnzaki Apr 06 '13 at 19:40
  • you can perform a sort of "dry run" and check what the merge is going to do, as described here http://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option – Gabriele Petronella Apr 06 '13 at 19:52

1 Answers1

1

What about 

git checkout master
git merge -Xtheirs otherbranch
Gabriele Petronella
  • 106,943
  • 21
  • 217
  • 235
  • I had found this mere moments before your answer, and was wondering if it is what I need or is there some gotcha. So far it appears to be what I want though. – mnzaki Apr 06 '13 at 21:33