What if 2 users are editing on the same version history?

[Yan Ling Tan]

If User A and User B are both editing on v2.0 of a shared document,

1. User A clicks "update" after he has made his changes. At this time, the current version has been changed to v3.0. However, User B is still editing on v2.0, if he is done and he clicks "update", what will happen?
2. User A and B are editing the same sentence on the same document at the same time, will they see each other editing (just like google docs)? And what if they both save their edited changes on the same line, what will happen?

[Vishwas · Accepted solution]

Hey @Yan Ling Tan 

Welcome to Atlassian Community !!

Let me address those queries.

Before answering to the questions, in confluence we have collaborative editing which allows simultaneously to work on the page for users at the same time.

1. User A clicks "update" after he has made his changes. At this time, the current version has been changed to v3.0. However, User B is still editing on v2.0, if he is done and he clicks "update", what will happen? --> This applies when collaborative editing is off. 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.
2. User A and B are editing the same sentence on the same document at the same time, will they see each other editing (just like google docs)? And what if they both save their edited changes on the same line, what will happen? -->If collaborative editing is on yes we can see who is editing what line in real time.  When collaborative editing is off 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. 

Check this KB for more details https://confluence.atlassian.com/doc/concurrent-editing-and-merging-changes-144719.html

Regards,

Vishwas

[Yan Ling Tan]

Hi Vishwas, thanks for replying. Can I clarify, for the scenario number 1 above, this will only happen when collaborative editing is turned on? If I do not invite other users to work on the document together, and we are separately editing the same document, will Confluence still inform user A that User B is also editing the document?

[Vishwas]

Hi @Yan Ling Tan 

For scenario number 1 the explanation I have written holds good when collaborative editing is disabled. If you don't invite them to work together it shows them the message like "this page is being edited by so and so user, when saved the changes will be merged".

Did you check this link ?

https://confluence.atlassian.com/doc/concurrent-editing-and-merging-changes-144719.html