[ktm5j]

I'm on my phone right now so I'm not going to dig too hard for this, but you can also configure a "merge tool" (or something like that) so you can use Meld or Kompare to make the process easier. This has helped me in a pinch to work out some confusing merge conflicts.

[newsoftheday]

I started using Meld years ago and continue to find people who've never heard of it. It's a pretty good tool.

[otherayden]

Huge meld fan here, recommended by a professor about a year ago. Game changer