By using `git merge --strategy=ours` we don't need to generate patches,
apply them one by one, and/or revert commits. This _drastically_
simplifies the code, and removes the need for everything that was
written in Ruby.