Edit conflict

For For, see Wiki.

For dealing with edit conflicts on the English Wikipedia, see Help:Edit conflict.

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 occurs when multiple editors edit the same file and cannot merge without losing part or all of their edit. 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. {{calc<use/simple>functions(MBTQ<sequel>a</sequel>Q<sequel>i</sequel>)^sequel=calc(wiki)^0(sequel)}}

Resolution

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 the previous versions of the file can still be accessed 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." ^[1]
• Merge, by determining if the edits are in unrelated parts of the file and combining without user intervention.

Occurrences

The problem is encountered on heavily edited articles in wikis (frequency higher in articles related to a current event or person), ^[2] distributed data systems (e.g., Google Sites ^[3] ), and revision control systems not using file locking, ^[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. ^[2]

See also

• Concurrent Versions System
• Apache Subversion
• Git (software)

References

1. Shelly, Gary B.; Frydenberg, Mark (2010). Web 2.0: Concepts and Applications. Cengage Learning. p. 72. ISBN   978-1-4390-4802-3. Archived from the original on 2023-03-18. Retrieved 2020-12-10.
2. Broughton, John (2008). Wikipedia: The Missing Manual. O'Reilly Media. pp. 11–13. ISBN   978-0-596-51516-4.
3. Teeter, Ryan; Barksdale, Karl (2009). Google Sites & Chrome for Dummies. For Dummies. ISBN   978-0-470-39678-0. Archived from the original on 2023-03-18. Retrieved 2020-12-10.
4. 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".
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. Edit conflict.