A merged branch diverged from master yet again, what's the best way to bring changes from the merged branch back into master?

Question

Branch A was merged with master, had its conflicts resolved and additional commits added. The master branch also has addition commits. What is the best way to merge these two branches and use branch A's changes over the master branch?

Thanks!

Google for 'git merge strategies'. There are [plenty of answers](http://stackoverflow.com/a/3364506/877115) out there. — Christopher, Nov 11 '13 at 21:04

score 1 · Accepted Answer · answered Nov 11 '13 at 21:10

1

The command below should do the trick - execute from master

git merge -s theirs A

answered Nov 11 '13 at 21:10

Eugene Sajine

8,104
3
23
28

A merged branch diverged from master yet again, what's the best way to bring changes from the merged branch back into master?

1 Answers1