GitHub Desktop or Git CLI?
You're viewing a single thread.
Sublime-Merge
I love Sublime Merge. Worth every penny.
