Detect and integrate changes done outside the real-time session

A wiki page that is being edited by multiple users in real-time could be modified outside the real-time session, either through scripts, or simply by someone that didn't want to join the real-time session. ATM, the users editing in real-time will notice this on the next auto-save checkpoint, if the auto-save triggers a merge conflict.

The question is: should we wait for the next autosave (1 minute) to detect that the page has been saved outside the real-time session or act immediately. I think it's better to notify the real-time users right away so that they don't duplicate work (make the same changes) or work in vain (make changes that are not relevant anymore).

In any case (whether we wait for the auto-save or not), we should be able to integrate the outside changes in the real-time session as smooth as possible.