We just realized some of our edits were lost because a couple users overwrote the same document at about the same time. Fortunately the edits are in the history.
The big problem here is not that Phriction doesn't offer a conflict resolution UI, that's overkilled relatively to the likeliness of edit conflicts, but that it fails **completely silently**. Such behavior could be accepted for edit conflicts on ticket or project description, since it's very unlikely 2 people will touch them at the same time, but Wiki documents are way more collaborative.
Here's a suggested solution:
# When editing a document, keep around the current version and pass it back on submission of the edit
# If the version of the edit doesn't match the current document version
- Display again the editing form with the version that couldn't be saved
- Display a warning message on top of the page that also has a link like "Show me what has changed in between" that opens the diff page between the version when edit was started and the latest version