What happens when two users edit the same page at the same time?

Concurrent Editing 

Concurrent editing is a feature of EditMe that accounts for multiple users editing the same page at the same time. A concurrent edit occurs under the following scenario:

1. User1 clicks Edit to make changes to a page.
2. While User1 is editing, User2 clicks Edit on the same page.
3. User1 clicks Save, making a new version of the page.
4. User2 clicks Save, overwriting the edits User1 just made.

EditMe merges concurrent changes. This means that if User1 made changes near the top of the page, and User2 made changes at the bottom, User2's edit version will include both User1 and User2 edits.

If User1 and User2 both edited the same section of the page, a merge conflict occurs. In this case, User2 is presented with a Diff of User1 and User2's versions. It is the responsibility of User2 in this case to incorporate User1's changes into a new version of the page.

Note: This feature only affects different users involved in a concurrent edit situation. A single user will always over-write their own edits in a concurrent edit situation. This is because users can easily create concurrent edits with themselves by using their browser's Back button.