Edit conflict

An edit conflict occurs when two users try to edit the same wiki page at the same time. Whoever hits "Save page" first wins, but this is not always the best outcome. The other user needs to know how to recover from an edit conflict, so they don't lose their work.

For example:

• John clicks Edit on an article.
• Mary clicks Edit on the same article.
• John finishes editing, clicks Save page and the article now contains his version.
• Mary finishes editing, clicks Save page and is presented with the "Edit Conflict" page. This shows the current source of the page on top (in this case, John's version), followed by the new edits (in this case, Mary's version). This enables the editor to merge the changes manually.

A similar situation would have happened if Mary had saved her version of the page first, since when John clicked Save page his edits would then conflict with the current version of the page.

In practice, manual merging is not always necessary as the Conservapedia system is able to resolve many potential edit conflicts automatically, if the edits were made to different paragraphs or sections of a page. The edit conflict page normally only appears when two people were editing the same few lines and automatic merging cannot tell which words or lines to save.

     __                             ___            _aaaa
              d8888aa,_                    a8888888a   __a88888888b
             d8P   `Y88ba.                a8P'Kittysayshello 23:59, 27 July 2007 (EDT)Y88a888P""Kittysayshello 23:59, 27 July 2007 (EDT)Y88b
            d8P      ~"Y88a____aaaaa_____a8P        888          Y88
           d8P          ~Y88"823:59, 27 July 2007 (EDT)~~88888P          88g          88
          d8P                           88      ____ _88y__       88b
          88                           a88    _a88~8888"8M88a_____888
          88                           88P    88  a8"'     `888888888b_
         a8P                           88     88 a88         88b     Y8,
          8b                           88      8888P         388      88b
         a88a                          Y8b       88L         8888.    88P
        a8P                             Y8_     _888       _a8P 88   a88
       _8P                               ~Y88a888~888g_   a888yg8'  a88'
       88                                   Kittysayshello 23:59, 27 July 2007 (EDT)    ~""8888        a88P
      d8'                                                Y8,      888L
      8E                                                  88a___a8"888
     d8P                                                   ~Y888"   88L
     88                                                      ~~      88
     88                                                              88
     88                                                              88b
 ____88a_.      a8a                                                __881

88""P~888 888b __ 8888888888

     888        888P                                d88b             88
    _888ba       ~            aaaa.                 8888            d8P
a888~"Y88                    888888                 "8P          8aa888_
       Y8b                   Y888P"                                88""888a
       _88g8                  Kittysayshello                                 a88    ~~
   __a8"888_                                                  a_ a88
  88"'    "88g                                                 "888g_
  ~         `88a_                                            _a88'"Y88gg,
               "888aa_.                                   _a88"'      ~88
                  ~~""8888aaa______                ____a888P'
                          ~~""""""888888888888888888""Kittysayshello
                                     23:59, 27 July 2007 (EDT)23:59, 27 July 2007 (EDT)~~