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?

  • My pull request has been merged, what to do next?
  • linked local repo to incorrect github account
  • git and removing files
  • How to modify existing, unpushed commits?
  • reset a git repo to an old commit?
  • How to push to bitbucket using intellij
  • About git-new-workdir branches syncing
  • How to ignore certain files in git?
  • git-svn: ignore case of svn usernames from authorsfile?
  • Will 'git reset' + 'git push' send my detached commits to the remote repository?
  • get mvn release:rollback to delete tag in GIT
  • Merge more than 2 branches/heads at once in Git?
  • Git Baby is a git and github fan, let's start git clone.