git mergetool reports “No files need merging”

前端 未结 7 1024
傲寒
傲寒 2020-12-05 12:57

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         


        
7条回答
  •  时光取名叫无心
    2020-12-05 13:28

    Could it be that you must first run merge? Then if there are merge conflicts to resolve, you can run mergetool. But until there are created as the results of an incomplete merge, I think mergetool will simply report there is nothing to merge.

提交回复
热议问题