Sick of spending hours merging divergent forks?
Tired of tracking down random reference duplicates in your project files?
Annoyed with randomly fucked XML in project files?
Suicidal because you thought DLL HELL was a thing of the past, only to find that it’s now called Nuget and the registry is now a .package file/files?
Well, this tip is for you!
1. Add a .gitattributes file alongside your .gitignore file in your repo.
2. Put his in it:
*.csproj -merge
*.sln -merge
packages.config -merge
Now, git will NEVER try to auto merge project, solution and package files.
FFS.