conflict is being used for a few unrelated things:
- Conflicts in source control
- Conflicts with binaries/libraries (version mismatches, etc.)
- Other conflicts in general
- When the word "conflict" appears in code (e.g., LINQ's "ConflictMode", which relates to case #3 as well)
If this tag stick around, I think we need to settle on one definition and clean it up.
The other solution is to kill it and have more specific tags, e.g., source-control-conflict or binary-incompatibility. Unfortunately I can't think up better tags (less awkward and easier to find while still being specific enough), so I'm not sure what the best course of action is here.