I'm in the process of merging two git branches that are pretty diverging. After the automatic merge was completed, I got several files with two versions:
file.cc~HEAD file.cc~branchA
So far, the original file.cc disappeared. Since both files are identical, I am a bit puzzled. Why is this happening? What conflict does he represent?
source share