[olvy0]

+1 for TortoiseGitMerge, which is my go-to tool these days. It's Windows only but not a problem for me since I mostly work in Windows.

My SO adores Meld, but she works with Linux. I tried using it but couldn't get used to it. She also makes fun of me (half in jest) because I use Tortoise Git instead of the command line...

[tigerlily]

I use TortoiseGit too, ever since I used TortoiseSVN back in the day. Highly underrated, and ridiculously powerful, I’ve practically never had to look up “how to do x” :)