My team uses Visual Studio for C ++ projects, and whenever we add new files to our branches, we get these nasty merge conflicts in the .vcxproj and .vcxproj.filter files. All that happens is one new entry added to each file for each file, but git doesn't seem to like it and thinks the whole file has changed. Thus, merge conflicts end up taking 5-10 minutes to resolve. Repeating this every time we have to merge becomes quite annoying.
Is there a way to avoid these conflicts, other than just not adding new files?
source
share