Page MenuHomePhabricator

Mark conflicting lines
Closed, DeclinedPublic


Mark conflicting lines in the the unified diff of the changes column.

Event Timeline

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptNov 22 2016, 1:51 PM

Change 329610 had a related patch set uploaded (by WMDE-Fisch):
Get conflict results from diff3

WMDE-Fisch closed this task as Declined.Apr 11 2017, 12:05 PM

It seems to be the case that a "conflicting line" equals a line where in both version - the one you edited and the one someone else edited - something was changed in comparison to the original version.

In the current version of the TwoColumnConflict extension this is already visible when "mine" and "your" changes appear in one paragraph. I guess this must not necessarily be marked with a special hint.

Furthermore its not quite clear what should be achieved when introducing an extra hint to theses lines. So closed for now.

Change 329610 merged by jenkins-bot:
[mediawiki/core@master] Get conflict results from diff3