I’ve been using the default merging tool in Ubuntu 12, Meld for any conflicts that pop up in our GIT repo’s code. Now this might be common knowledge for many, then again it might be unknown to others. To navigate quickly between the differences between the two files, place yourr mouse cursor between the panel between the two files, and simply scroll with your mouse scroll button. Each scroll will fast forward Meld to the next change/conflict. This saves you tons of time when working with large files, or files with a large number of changes between them.