This post discusses how to resolve a Git merge conflict with the help of KDiff3 and analogies.
There are some great free and/or open-source software applications on the internet. Some are well known, others a little less. Find out if you are acquainted with ones listed here.