What I Learned Today
I had a massive merge conflict today in a local Git repository pulling both from a remote Git repo and an SVN repo. I dug into Git in order to make the process easier. The first thing I found was git mergetool. I don't know how I didn't know about this.
I merged everything using git mergetool, but then accidentally blew away the merge. Even with mergetool, it took 10 minutes to fix the conflicts. There had to be a better way. The branch I was on had the right code in every situation - I was trying to get SVN up-to-date with my Git repo. I read up on the different Git merge strategies and found out about the ours strategy. It's brute simple, but it worked: on all conflicts, it chose my change and moved on.
Published: