Git Rebase merge auto take

Question

I have

              G---H---I---J    Develop
             /
A---B---C---D---E---F    Master

I want to rebase Develop with master, so:

                      G---H---I---J    Develop
                     /
A---B---C---D---E---F    Master

So if I do git checkout develop & git rebase master

It will do the rebase, however, at each commit where it finds a merge conflict it will stop.

I'm happy just to take everything from develop and overwrite with that. There have been massive changes with develop but each commit builds and passes all tests, so I can assume if I just overwrite everything in master it should be fine.

So how do I say something like git rebase master --choose develop side

Answer 1

That would be git rebase -X theirs master