Tracking bug for better handling edit conflicts, particularly for content namespace wikitext editing: reduce conflicts, resolve them automatically more often, make manual resolution less painful.
Closely related to diff algorithms (diff3 is key here); I'll add some of those bugs too but let's see if that expands the scope too much.
This is NOT about radical restructuring of the editing workflow (examples: "just use Google Docs"; bug 1898; "ditch talk pages").
Statistics: https://grafana.wikimedia.org/dashboard/db/mediawiki-edit-conflicts (probably not covering API edits, per Addshore).
Also proposed in Community-Wishlist-Survey-2016. View related proposals with full discussion and votes here: