Sorry for cross posting.
The Technical Wishes team has released a new version of the beta feature “two-column edit conflict“ on all wikis.[1] In order to make edit conflict solving even easier than the first beta feature, the new interface allows to solve edit conflicts line by line.
To try the new interface, activate the beta feature two-column edit conflict in your preferences. If you were already using the old beta feature, you’ll get the new interface automatically.
Let us know what you think on the central feedback page.[2]
Thanks,
Michi for the Technical Wishes team
[1] https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View [2] https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View
PS: This morning there was a problem after enabling the new version, this has been fixed. For background on this issue see https://lists.wikimedia.org/pipermail/wikitech-l/2018-November/091103.html