Users who try to resolve an edit conflict should be able to see if their changes have the desired effect. Therefore we want to give them the ability to see a preview (we are not showing a diff, since the edit conflict resolution screen is very close to a diff view anyways).
It is important to note, that this preview should not change the structure of the edit conflict resolution interface, since this is what the user's mental model currently looks like. This means that even conflicts that have already been resolved through edits in the interface are still shown in the conflict view.
- When users click on "show preview", a preview of the currently selected version is being shown on top of the page
- The edit conflict resolution part stays exactly the same
- It is acceptable if this works for js users only, and with usage of the REST base API