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?

  • How do I update my forked repo using SourceTree?
  • git submodule commit/push/pull
  • specifying git branch for remote
  • Configure git to track only one file extension
  • Should I use .gitignore, or auto-detect configurations for different servers in staging?
  • Can I add issues to github from the command line?
  • How to push a locally-create branch
  • Managing private repositories in Github
  • changing git comment of a pushed commit
  • Detach subdirectory (that was renamed!) into a new repo
  • Git commit a commit message and nothing else?
  • Set up git to pull and push all branches
  • Git Baby is a git and github fan, let's start git clone.