What are BASE, LOCAL, REMOTE and cppMerged files? [closed]

This question is unlikely to help any future visitors; it is only relevant to a small geographic area, a specific moment in time, or an extraordinarily narrow situation that is not generally applicable to the worldwide audience of the internet. For help making this question more broadly applicable, visit the help center. Closed 10 years ago.

I'm working on a Visual C++ project on Win7 64bit and using git as my repository and VS2010 as my IDE. Lately I've started seeing files with the following endings:

.cpp.BASE.cpp
.cpp.LOCAL.cpp
.开发者_C百科cpp.REMOTE.cpp
.cppMerged

Are these git merge conflict resolution files? VS2010 files? or something else?

---

git merge just works in the index, it doesn't create temporary files in the file system to perform its merge.

If there are conflicts during a merge and you use git mergetool to resolve them then git mergetool will write out temporary files to enable your merge tool of choice to perform a 3-way merge. Usually these are cleaned up automatically but if you interrupt the git mergetool workflow they can be left in place.

---

This seems to be an open issue in TortoiseGit