What is meta? ×
Meta Stack Exchange is where users like you discuss bugs, features, and support issues that affect the software powering all 140 Stack Exchange communities.

and are being used the same way and should be synonymized and/or merged (preferably in the direction of the latter). has been merged into . Thanks Robert.

is being used for a few unrelated things:

  1. Conflicts in source control
  2. Conflicts with binaries/libraries (version mismatches, etc.)
  3. Other conflicts in general
  4. 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., or . 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.

share|improve this question
[conflict] looks like it is the master tag. –  Robert Harvey Jan 23 '12 at 21:21

You must log in to answer this question.

Browse other questions tagged .