feature-request planned
Just now it happened that both of us, @marmot and I, wanted to make an edit to the same question (https://topanswers.xyz/meta?q=389), he saved his edit prior to me (at 2019-12-09 19:32:55), but I clicked on "edit" before he did, so I got the state the question was in prior to his edit, and after I did my edit and saved it (2019-12-09 19:33:23) I deleted everything he added in the meantime.

There should be some measures to prevent/resolve such race conditions.
Top Answer
Idea on how to prevent those conflicting edits: Branch out the message at the moment one hits edit and if there were edits in the meantime try to merge. If that's not possible show the merge conflicts. This would be similar to git.
Answer #2
Jack Douglas
This is going to get more important as more people join so we need to start thinking about implementation soon.

I've moved this on to [to a GitHub issue](https://github.com/topanswers/topanswers/issues/16) so work can begin, and will update the post here when it is complete.
Race conditions on edits.
Jack Douglas replying to Skillmon
very good point — and at the very least we will need to warn the second user when posting their update. Better I think would be to poll for other changes every 10s while editing as well, and warn when they are detected.
Skillmon replying to Jack Douglas
That's what I did after we realised the problem. The problem is that one might not notice the conflicts.
Jack Douglas
@Skillmon It's a good suggestion. Until this happens, please use the edit history to manually merge the changes — not perfect but better than nothing I think!