Edit conflict

From Wikipedia, the free encyclopedia
  (Redirected from Conflict (revision control))
Jump to navigation Jump to search
A representation of an edit conflict. To resolve the conflict, the goat lover must choose whether to keep their changes or merge them with the cat lover's.

An edit conflict is a computer problem that may occur when multiple editors edit the same file during a short time period. The problem is encountered on wikis, distributed data systems, and revision control.[1] To save the file while minimizing edits, the conflict must be resolved.


An edit conflict is a computer problem that may occur when multiple editors edit the same file during a short time period. The conflict occurs when an editor gets a copy of a shared document file, changes the copy, and attempts to save the changes to the original file, which has been altered by another editor after the copy was obtained. To save the original file, the edit conflict must be resolved.


The simplest way to resolve an edit conflict is to ignore intervening edits and overwrite the current file. This may lead to a substantial loss of information, and alternative methods are often employed to resolve or prevent conflicts.

  • Manual resolution, where the editor determines which version to retain and may manually incorporate edits into the current version of the file.
  • Store backups or file comparisons of each edit, so there are backups changes of the file once the original is overwritten
  • File locking, which limits the file to one editor at a time to prevent edit conflicts. Computer writer Gary B. Shelly notes that many wiki systems "will block the contributor who is attempting to edit the page from being able to do so until the contributor currently editing the page saves changes or remains idle on the page for an extended period of time."[2]
  • Merge, by determining if the edits are in unrelated parts of the file and combining without user intervention.


The problem is encountered on wikis, distributed data systems (e.g., Google Sites[3]), and revision control systems not using file locking.[1] The problem is more likely to occur when working on heavily edited articles on Wikipedia, such as those about a current event or a person suddenly in the news,[4] as well as other high-traffic pages.[5] If a significant amount of new text is involved, the editor who receives an "edit conflict" error message can cut and paste the new text into a word processor or similar program for further editing, or can paste that text directly into a newer version of the target document. Simple copyediting can be done directly on the newer version, and then saved.[4]

See also[edit]


  1. ^ a b Michael Antonovich (2010). Office and SharePoint 2010 User's Guide: Integrating SharePoint. p. 321 (752 pages), quote: "Edit conflict on a list linked to SharePoint".
  2. ^ Shelly, Gary B.; Frydenberg, Mark (2010). Web 2.0: Concepts and Applications. Cengage Learning. p. 72. ISBN 978-1-4390-4802-3.
  3. ^ Teeter, Ryan; Barksdale, Karl (2009). Google Sites & Chrome for Dummies. For Dummies. ISBN 978-0-470-39678-0.
  4. ^ a b Broughton, John (2008). Wikipedia: The Missing Manual. O'Reilly Media. pp. 11–13. ISBN 978-0-596-51516-4.
  5. ^ Ayers, Phoebe; Matthews, Charles; Yates, Ben (2008). How Wikipedia works: and how you can be a part of it. No Starch Press. p. 139. ISBN 978-1-59327-176-3.