All geek questions in one place

What are BASE, LOCAL, REMOTE and cppMerged files?

I am working on a Visual C ++ project on Win7 64bit and using git as my repository and VS2010 as my IDE. Recently, I started looking at files with the following endings:

.cpp.BASE.cpp .cpp.LOCAL.cpp .cpp.REMOTE.cpp .cppMerged

Do these git files combine conflict resolution files? VS2010 files? or something else?

+4
source share
2 answers

It looks like an open issue in TortoiseGit

-2
source

git merge only works in the index, it does not create temporary files in the file system to merge it.

If there are conflicts during the merge, and you use git mergetool to resolve them, then git mergetool will write temporary files so that your merge tool can perform a three-way merge. They usually clean up automatically, but if you interrupt the git mergetool workflow, you can leave them in place.

+5
source

Source: https://habr.com/ru/post/1336465/

More articles:


All Articles