Change 178062 had a related patch set uploaded (by Addshore):
When merging items, reuse conflicting labels as aliases

https://gerrit.wikimedia.org/r/178062

Patch-For-Review

There is a question in my commit as not sure which way this should be implemented...

Option 1 (implemented), when ignoreConflicts for labels is passed any labels will be merged into aliases, if not ignoreConflicts for labels is passed then the merge would still not happen

Option 2 (not implemented), when merging any items the option to ignoreConflicts for labels is removed thus if there is ever a conflict it will ALWAYS be merged into aliases.

Comments?

My approach would be:

• Keep the target label
• Keep the target aliases
• If the source item label is different than the target item label and the label isn't already in target aliases, add it to target aliasses
• For each source item alias: If it's not the target label and not already in the target aliasses, add it

So the target (lowest Q) "wins", but no variants get lost.

I guess I will do the above and remove the ignore Conflicts flag for labels then?
Comments?

Change 178062 merged by jenkins-bot:
When merging items, reuse conflicting labels as aliases

https://gerrit.wikimedia.org/r/178062