Other URLs

https://design.xwiki.org/xwiki/bin/view/Design/MergeConflictResolutionUI
https://design.xwiki.org/xwiki/bin/view/Proposal/EditConflict

Description

We currently have two main usecase for a merge conflict resolution UI:

• the older one is related to the extension manager (cf https://design.xwiki.org/xwiki/bin/view/Design/MergeConflictResolutionUI)
• and the newer is related to the edit conflict warning UI (cf https://design.xwiki.org/xwiki/bin/view/Proposal/EditConflict)

Until recently the only way to solve a conflict was to make choices for an entire document and to choose either the previous, current or next version for it.
However those choices are really coarse grained, and we push with https://jira.xwiki.org/browse/XCOMMONS-1682 the capability to make choices for a specific conflict. 

Now the question remains, how to allow users to make their choices in terms of UI, knowing that now 4 choices are possible:
  - previous
  - current
  - next
  - custom

where custom is a value typed by the user when fixing the conflict.

Decision to take / Open questions

1. Do we want to always display the whole diff in those merging conflict UI, or should we only display the conflicts area?
2. How do we handle conflicts that occurred on multiple lines?

Proposals

Version 1