We talked about scrolling a bit more in the PM-meeting on 18/01/2017:

• the behavior described in the description still stands
• additionally, the editor should scroll to the relevant position whenever the user scrolls to a certain conflict in the "Conflicting changes" box

@Jan_Dittrich made the following suggestion as a rough implementation idea:

• Get diff for “mine” and “theirs”.
• In a non-visible element, render it with the same style, same size of containing box like the editor right hand, but with markup (spans around changes). No additional padding/margin due to that!
• Get offset of that span around change, relative to parent element+scroll position. save that.
• Get the equivalent element in the RENDERED version
• On click on that rendered element in the diff view, set the scroll position of the editor to the offset.

A prototype (for another project) is available at https://github.com/jdittrich/ep_autocomp, specifically at https://github.com/jdittrich/ep_autocomp/blob/master/static/js/autocomp.js#L478 and https://github.com/jdittrich/ep_autocomp/blob/master/static/js/autocomp.js#L544

Change 333026 had a related patch set uploaded (by WMDE-Fisch):
Auto-scroll editor to foreign change

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

Change 333026 merged by jenkins-bot:
Auto-scroll text editor to changes

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

Agreed on auto scrolling to the first own change instead of the first conflict since that makes more sense.

Change 335239 had a related patch set uploaded (by WMDE-Fisch):
Scroll to first own change instead of first conflict

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

Change 335239 merged by jenkins-bot:
Scroll to first own change instead of first conflict

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