data/TWiki/SimultaneousEdits.txt
author Colas Nahaboo <colas@nahaboo.net>
Mon, 11 Aug 2008 20:33:37 +0200
changeset 2 7bc60a767fa4
parent 0 414e01d06fd5
permissions -rw-r--r--
TWiki-4.2.2 Release
     1 %META:TOPICINFO{author="TWikiContributor" date="1111929255" format="1.0" version="5"}%
     2 %META:TOPICPARENT{name="TWikiFAQ"}%
     3 ---++ FAQ:
     4 
     5 What happens if two of us try to edit the same topic simultaneously?
     6 
     7 ---++ Answer:
     8 
     9 TWiki allows multiple simultaneous edits of the same topic, and then merges the different changes automatically. You probably won't even notice this happening unless there is a conflict that cannot be merged automatically. In this case, you may see TWiki inserting "change marks" into the text to highlight conflicts between your edits and another person's. These change marks are only used if you edit the same part of a topic as someone else, and they indicate what the text used to look like, what the other person's edits were, and what your edits were.
    10 
    11 TWiki will warn if you attempt to edit a topic that someone else is editing. It will also warn if a merge was required during a save.
    12 
    13 __Back to:__ TWikiFAQ
    14 
    15 
    16 __Related Topics:__ UserDocumentationCategory