14 tips and tools to resolve conflicts with Git

Resolving conflicts can sometimes be a real pain even if you are an experienced developer. This list include some nice tips on how to make your life easier when dealing with conflicts for Git users.
https://developer.atlassian.com/blog/2015/12/tips-tools-to-solve-git-conflicts/

GitUp – The Git interface you’ve been missing all your life has finally arrived

Still in pre-release status but this new Git interface looks very promising. Edit commit messages and advanced search are already in the feature list. FREE for now..
http://gitup.co/