- Compose selected lines and save as resolved conflict
- Add an edit summary line that contains the previously entered message (before the conflict occured)
- Add a cancel option that leads you to the current version of the page
- This is all non-js
Mock
Look at No. 8 of the mock (and resolve the mystery by clicking on it)
Notes
- Most likely we will have an action triggering us at the edit page. At this point we will compose the content, and then return it to the usual edit process