Search code examples
gitgithubmergemergetool

`git mergetool`, A `fileName.~fileType` file was produced

MAC produced an README.~md file When I have solved the git conflict use the command git mergetool with Beyond Compare. I think two ways to solve this, but I don't know which is the best practice.

  1. What can I do to avoid produce the .~ file?
  2. I add the *.~** into the .gitignore,and delete the *.~** file later.

I found the README.~md show the detail of this conflict. It contains the unsolved conflict content.

Solution

  • enter image description here

    Beyond Compare set the Backups all backups to disable. By the way, Beyond Compare is a good tool.