CODEWITHSUNDEEP
git
jpiasetz
jpiasetz

Reputation: 1772

git rebase always use current branch file version for conflicts

I want to go from 

      A---B---C topic
     /
D---E---F---G master

to

              A--B--C topic
             /
D---E---F---G master

i.e. do a rebase but for every conflict take what the file looks like in A.

Upvotes: 1

Views: 1255

Answers (1)

Lajos Veres
Lajos Veres

Reputation: 13725

I think this should work:

git checkout topic
git rebase -s recursive -X theirs master

Upvotes: 8

Related Questions