Ah, I wrote an article on resolving diff3 conflicts by hand: http://h2.jaguarpaw.co.uk/posts/git-rebase-conflicts/ http://h2.jaguarpaw.co.uk/posts/git-rebase-co

Ah, I wrote an article on resolving diff3 conflicts by hand: http://h2.jaguarpaw.co.uk/posts/git-rebase-conflicts/ http://h2.jaguarpaw.co.uk/posts/git-rebase-conflicts/