Git GUI
i recommend gitkraken tool
Bored Buffalo
i recommend gitkraken tool
Sublime Merge: https://www.sublimemerge.com/
Sourcetree: https://www.sourcetreeapp.com/
GitHub Desktop: https://desktop.github.com/