Remove union merge driver for sln, csproj files #1063
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The union merge driver is not appropriate for sln or csproj files. It is useful (as described by Junio) to "merge two shopping lists". This will work in trivial examples for sln and csproj files, for example when one branch adds a new file and the other branch does too, but it will often silently produce corrupt output.
|
👍 |
nulltoken
added a commit
that referenced
this pull request
May 31, 2015
Remove union merge driver for sln, csproj files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The union merge driver is not appropriate for sln or csproj files. It is useful (as described by Junio) to "merge two shopping lists".
This will work in trivial examples for sln and csproj files, for example when one branch adds a new file and the other branch does too, but it will often silently produce corrupt output.
@haacked has a nice writeup at http://haacked.com/archive/2014/04/16/csproj-merge-conflicts/