git mergetool reports “No files need merging”

Question

For some reason lately, every time I pull and get a merge conflict, running git mergetool reports \"No files need merging\":

$ git pull
First, r         


        

Answer 1

In my case the issue was that I had another console window open and was running the application (based on create-react-app, with hot reloading) in that window.

Killing the process and closing the other window, then aborting the rebase and retrying worked for me.