Concurrent editing is made easier in Confluence 2.1.
How will I know if someone else is editing the same page as I am?
If another user is editing the same page as you, Confluence will display a message above your edit screen letting you know who the other user is and when the last edit was made.
What happens if two of us are editing the same page and the other user saves before I do?
If someone else has saved the page before you, when you click 'Save', Confluence will check if there are any conflicts between your changes and theirs. If there are no conflicting changes, Confluence will merge both the edits successfully. If there are any conflicts, Confluence will display them for you and give you the option to either 'Overwrite' the other user's changes, 'Merge your changes' manually, or 'Discard' them.
RELATED TOPICS
Working with Drafts Overview
Working with Drafts Faq
Take me back to [Confluence 2 Home]