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?