Editing a Page

Edit Summary

Note that at the bottom of the editor there is the following:

This is the Edit Summary which allows you to add details about the changes that you have made before saving. The edit summary is then visible in the page versioning along with other pages that show system changes like Recent Changes and Contributions.  Read more about versioning.

Multiple Edits - Merge Conflicts

MindTouch has a sophisticated merging engine that will recognize separate changes down to the word and accurately merge the revisions together. This helps with collaboration as there are less chances that if more than one user is editing a page there will be conflicts.

First let’s examine at a high level how MindTouch handles a merge.

Say you have the following set of sentences:

The dog ran along the fence while the boy biked away.
The boy was heading off to college to pursue his lifelong dream of being a developer.  

Bob edits the first sentence to read this: The black dog ran along the white fence while the boy biked away.

And Tim edits the second sentence to read: The boy was heading off to college to pursue his lifelong dream of being a baker.

These edits occur at the same time but are saved at different times. Regardless of who started the edit first and who saved first, MindTouch will merge the sentences together to form a comprehensive set of sentences as it is intended:

The black dog ran along the white fence while the boy biked away.
The boy was heading off to college to pursue his lifelong dream of being a baker.

This is also true on a Section and Page level.

Now if Bob and Tim’s edits were to overlap then both edits will still be saved, but the last person to save will have the opportunity to review and compare the edits and confirm that nothing has been lost that should be kept.

Example:

Using the same sentences from above. Bob edits the first sentence to read:

The black duck waddled next to the white fence while the boy biked away.

While Tim edits the first sentence to read:

The black cat walked on top of the white fence while the boy biked away.

Bob saves his changes first which is accepted by the system. Tim saves his changes which is also accepted by the system. The system notices that there is some overlap and notifies Tim that there is a difference between his edit and what Bob had changed along with prompting him to compare versions to see the difference. This allows Tim to review Bob’s changes at a glance. If Bob’s changes need to be reincorporated, Tim can do so by re-edting the page. Otherwise Tim can also chose to leave the page as is.

We have put a lot of work into our conflict merging to ensure that you don’t lose content and to maintain the integrity of edits so that they can be integrated manually by the user as opposed to removing the edit because of a conflict.