Sublime Merge

Sublime's suite of tools are .... sublime :P ..

But actually, I really enjoy the simplicity of merge and usability. I don't always need to git from a UI, but on occasion it's nice to have a visual helper to solve conflicts or cherry picks.

One of the standouts is the 'show underlying git commands' feature that I use to help me learn crazy git commands.

No more copying over entire folders, recloning, new branch, copy back over and resolve from there.

Sublime Merge integrates nicely with Sublime Text and is an easy way to navigate git repositories.

Of all of the Git clients I've used, this is the only client that keeps the closest parity with the Git tool while keeping a clean and functional UI. I recommend this to all developers new and experienced, because you get to see what flags you're running for each command