Why does 'git merge' add files ending with tilde?

I’m in the process of merging two git branches that are fairly diverged.
After the automatic merge is complete, I ended up having multiple files having two versions:


While the original file.cc was gone.
Since both files are identical, I’m slightly puzzled. Why does it happen? Which kind of conflict does it represent?

  • git: merge branch and use meaningful merge commit message?
  • gitlab: git clone https with large repos fails
  • GitHub desktop stuck on syncing?
  • Rails “script/plugin” install http://github.com…git hangs on 'git pull'
  • Why git don't ignore contents of surefire-reports\ folder in maven target folder?
  • Warning: You appear to have cloned empty repository in TortoiseGit
  • How to override cherry-pick conflicts
  • Perforce: how to track file “deployments”
  • git read-tree to project root
  • Git in TFS - Remove branches after merging
  • Git: Commit whitespace refactoring without overwriting history
  • Cannot add files, not a git repository
  • Git Baby is a git and github fan, let's start git clone.