SimultaneousEdits (3 vs. 4)

Welcome, Registration, and other StartingPoints; TWiki history & Wiki style; All the docs...	View r4 > r3 ...
Main AmLegalHist CompPrivConst EngLegalHist LawContempSoc LawNetSoc TWiki

 SimultaneousEdits 4 - 27 Mar 2005 - Main.TWikiContributor
 Line: 1 to 1
   FAQ: 

What happens if two of us try to edit the same topic simultaneously?

 Answer: 
 Changed: 
<
< The second person gets a warning that the topic is currently being edited by another user. A topic gets locked automatically for some time (default is one hour) when you edit, preview or save the topic. If you get the lock warning you should wait until the lock is gone or contact the other person to ask if you can go ahead and break the lock. See also UnlockTopic? .
>
> 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.

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.
  Back to: TWikiFAQ
 Deleted: 
<
< -- TWiki:Main.PeterThoeny - 27 Nov 2000
  
 Added: 
>
> Related Topics: UserDocumentationCategory
  FAQ: 

What happens if two of us try to edit the same topic simultaneously?

 Answer:
-<
<
+The second person gets a warning that the topic is currently being edited by another user. A topic gets locked automatically for some time (default is one hour) when you edit, preview or save the topic. If you get the lock warning you should wait until the lock is gone or contact the other person to ask if you can go ahead and break the lock. See also UnlockTopic? .
->
>
+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.

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.
 Back to: TWikiFAQ
-<
<
+-- TWiki:Main.PeterThoeny - 27 Nov 2000
->
>
+Related Topics: UserDocumentationCategory

Revision 4	r4 - 27 Mar 2005 - 13:14:15 - TWikiContributor
Revision 3	r3 - 15 Aug 2004 - 08:40:05 - PeterThoeny?

This site is powered by the TWiki collaboration platform.
All material on this collaboration platform is the property of the contributing authors.
All material marked as authored by Eben Moglen is available under the license terms CC-BY-SA version 4.

Syndicate this site RSS ATOM