Git rebase - force overwrite on merge conflict

Question

I am trying to do a git rebase to migrate data to a disconnected SVN clone branch.

Let's say I am trying this with the SoundManager2 repo from Github .

About the first 20 or so of the rebase actions will work fine. After that it will start hitting some conflicts. Most of them resolve automatically, but regardless it makes me stop and continue.

In this case, I don't care what the conflict is. I just want to overwrite any conflicting files with whatever the latest file is. I've tried to get different merge strategies work, but have had no success.

Any ideas or thoughts? Thanks.

Answer 1

You will always get this issue. Git can't assume anything when there's a conflict. Sounds like you want your changes to be on top of whatever is published to the svn repo. I would use "rerere" to help you.

Merging is often better when trying to incorporate latest changes often.

Good luck!