Can we detect which paragraphs are **not** in conflict, and possibly auto-resolve these or pre-select one side?
As of now, the TwoColConflict code just detects if a conflict happened, but not where. The resolution interface shows all paragraphs, not only the conflicting ones.
This came up while discussing T229217.
== Examples
Here are two cases, treated four different ways.
* In case "A", the "other" user has made a lot of little changes throughout the document, and "you" have changed two paragraphs.
** **A-1**: Current code. Show the full diff.
** **A-2**: Optimistic merge from yours into other.
** **A-3**: Optimistic merge from other into yours.
** **A-4**: Attempt optimistic merges in both directions.
* In the case "B", the other user made few changes, and you made a lot of changes throughout.
** **B-1**: Current code. Show the full diff.
** **B-2**: Optimistic merge from yours into other.
** **B-3**: Optimistic merge from other into yours.
** **B-4**: Attempt optimistic merges in both directions.
=== A-1
{F31705129}
=== A-2
{F31705132}
=== A-3
{F31705133}
=== B-1
{F31705134}
=== B-2
{F31705136}
=== B-3
{F31705138}