git tells me that I Merge conflict, but also tells me that no files need merging

Question

I committed some changes in the branch new.

I checkout out to master.

When I tried to merge:

$ git merge new
Auto-merging js/site.js
CONFLICT (content): Merge conflict in js/site.js
Automatic merge failed; fix conflicts and then commit the result.

So I installed kdiff3 and configured my config files and when I tried to use mergetools I got:

$ git mergetool kdiff3
No files need merging

I ran a diff and it outputted this:

diff --cc js/site.js
index 8c17d62,7955b13..0000000
--- a/js/site.js
+++ b/js/site.js
@@@ -72,4 -81,18 +81,22 @@@ function doSmallScreen()

  $(document).ready(function () {
      calculateScreen();
- });
++<<<<<<< HEAD
++});
++=======
+     $(window).resize(function () {
+         delay(function () {
+             calculateScreen();
+         }, 500);
+     });
+ });
+
+
+ var delay = (function () {
+     var timer = 0;
+     return function (callback, ms) {
+         clearTimeout(timer);
+         timer = setTimeout(callback, ms);
+     };
 -})();
++})();
++>>>>>>> new

I am confused as to how to solve this, I want to solve this in the simplest manner possible, I don't really care if I lose the information from the branch new, but I want to understand what went wrong and why I can't use the merge tools.

It just seem weird to me that I have a merge conflict but no files need to be merged.

Answer 1

I tried

git mergetool .

Seemed to work.

Answer 2

I had this issue even when just running the correct command:

$ git mergetool

It may have something to do with having rerere turned on (see this link [Ed.: link no longer working])

I resolved the issue by creating two aliases in .gitconfig, which kick off mergetool for each conflicted file:

Add this to your .gitconfig

# List conflicted files
list-conflicts = !git ls-files -u | cut -f 2 | sort -u

# Force mergetool to recognize conflicts
force-mergetool = !git list-conflicts | xargs git mergetool

tl;dr By request, here's a brief explanation of what this does:

• git ls-files -u: after a merge attempt with conflicts, this lists all unmerged files, along with some extraneous information and repetition; if run right after a merge, this is essentially all the files with conflicts
• | cut -f 2 cuts out the 2nd field of this output, which is essentially the file path
• | sort -u eliminates duplicates
• | xargs git mergetool pipes this list of files into the mergetool command, which launches your GUI merge tool (assuming you have one set up)

So you can run the first command if you just want to see the files listed. The second command will pipe those all into your merge tool (you could use merge instead of mergetool if that's your preference).

If you want to try it out on your own before adding an alias, you could just run one of these two commands via the command line:

git ls-files -u | cut -f 2 | sort -u

git ls-files -u | cut -f 2 | sort -u | xargs git mergetool