Github user FRosner commented on the issue: https://github.com/apache/zeppelin/pull/2176 I am not sure if this change helps. We still have a race condition and conflict resolution is still "forceful overwrite and don't notify". If I see it correctly: *Before*: Who persists the local changes earlier, wins the conflict. (User A wins in the [example](https://github.com/apache/zeppelin/pull/2176#issuecomment-290395313) above) *Now*: Who persists the local changes later, wins the conflict. If this is the expected behaviour and what you wanted to achieve, then LGTM :) PS: If live editing like in Google docs can't be easily done, we could at least lock the paragraph for all but one user. A lock is granted when a paragraphs is focused. The lock gets released either when the focus is lost or someone else wants to acquire the lock. Changes get persisted before the lock gets released (i.e. either when losing focus or someone else also wants to edit). This way you cannot overwrite any remote changes as the paragraph will always get updated when you click into it and we don't have a race condition because of the lock.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---