upvote
Just use Sublime Merge, it's probably the best GUI for Git there is.
reply
GitKraken has been good in my experience with it for many years
reply