A combination of git diff, git checkout --ours/theirs . && git add and git mergetool works well in my experience