CargoAdmin, Bureaucrats, Moderators (CommentStreams), fileuploaders, Interface administrators, newuser, Push subscription managers, Suppressors, Administrators
14,662
edits
Help:Edit conflict: Difference between revisions
m
Text replacement - "Saintapedia" to "USApedia"
m (Text replacement - "Category:HelpCategory:Help under review" to "Category:Help") Tag: Manual revert |
m (Text replacement - "Saintapedia" to "USApedia") |
||
| Line 10: | Line 10: | ||
* Alice finishes her edits and clicks "Publish changes". The software saves Alice's edits as revision #125, but discovers that #125 is based on revision #123, although the currently published revision is #124. The software tries to automatically reconcile the differences, but fails. Alice therefore gets an "'''edit conflict'''" page, giving Alice a chance to reconcile the differences between #124 and #125 manually. | * Alice finishes her edits and clicks "Publish changes". The software saves Alice's edits as revision #125, but discovers that #125 is based on revision #123, although the currently published revision is #124. The software tries to automatically reconcile the differences, but fails. Alice therefore gets an "'''edit conflict'''" page, giving Alice a chance to reconcile the differences between #124 and #125 manually. | ||
== | == USApedia == | ||
TBD | TBD | ||