I have a branch on which I have a significant amount of change that I want to "merge" back to master, but I want that branch to replace what's in master now, not merge into it. I think I can use the following to accomplish that for merging
mybranch into
master:
git checkout master
git merge -s theirs mybranch
I have also seen it suggested that i merge master into mybranch into master first, using
-s ours and then merge mybranch into master.
Recommendations?
