I want to go from this
A - B - C - D - E - F - G
where Branch1 is pointing at E and Branch2 is pointing at G
to this:
How do I go about telling git that I don't want to merge them, I just want to take 'theirs' each time?
That would be with a custom merge driver, that you can associate specifically with all binaries (*.dll
, *.exe
, *.so
, ... whatever your particular binary extension is in your case)
See "git merge -s theirs needed — but I know it doesn't exist" for illustration.
What I haven't tested is: does the custom merge driver applies during a rebase --onto
.