请输入您要查询的百科知识:

 

词条 Edit conflict
释义

  1. Description

  2. Resolution

  3. Occurrences

  4. See also

  5. References

{{More citations needed|date=February 2018}}{{dablink|For dealing with edit conflicts on English Wikipedia, see Edit conflict}}{{for|back-and-forth disagreements in wiki editing|edit war}}

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.

Description

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 another editor after the copy was obtained. To save the original file, the edit conflict must be resolved.

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 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.

Occurrences

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

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

References

1. ^Michael Antonovich (2010). [https://books.google.com/books?id=rSygoG-FhcAC&pg=PA321 Office and SharePoint 2010 User's Guide: Integrating SharePoint]. p. 321 (752 pages), quote: "Edit conflict on a list linked to SharePoint".
2. ^{{Cite book|url=https://books.google.com/books?id=WYSP0ll6ftcC&pg=PA72&dq=%22Edit+conflict%22&hl=en&ei=ZQ_QTfvBJYKcsQOE0Yz9DA|title=Web 2.0: Concepts and Applications|last=Shelly|first=Gary B.|author2=Frydenberg, Mark|date=2010|publisher=Cengage Learning|isbn=978-1-4390-4802-3|page=72}}
3. ^{{Cite book|url=https://books.google.com/books?id=heU9mQ4HovcC&pg=PT114&dq=%22Edit+conflict%22&hl=en&ei=ZQ_QTfvBJYKcsQOE0Yz9DA&sa=X&oi=book_result&ct=result&resnum=10&ved=0CGAQ6AEwCQ#v=onepage&q=%22Edit%20conflict%22&f=false|title=Google Sites & Chrome for Dummies|last=Teeter|first=Ryan|author2=Barksdale, Karl|publisher=For Dummies|year=2009|isbn=978-0-470-39678-0|location=|pages=}}
4. ^{{Cite book | last = Broughton | first = John | title = Wikipedia: The Missing Manual | publisher = O'Reilly Media | date = 2008 | pages = 11–13 | url = https://books.google.com/books?id=h37N0BvkVSUC&pg=PA11 | isbn = 978-0-596-51516-4}}
5. ^{{Cite book | last = Ayers | first = Phoebe |author2=Matthews, Charles |author3=Yates, Ben | title = How Wikipedia works: and how you can be a part of it | publisher = No Starch Press | edition = | year = 2008 | location = | page = 139 | url = https://books.google.com/books?id=lHdi1CEPLb4C&pg=PA139&dq=%22Edit+conflict%22&hl=en&ei=ZQ_QTfvBJYKcsQOE0Yz9DA&sa=X&oi=book_result&ct=result&resnum=2&ved=0CDcQ6AEwAQ#v=onepage&q=%22Edit%20conflict%22&f=false | isbn = 978-1-59327-176-3}}

1 : Wiki concepts

随便看

 

开放百科全书收录14589846条英语、德语、日语等多语种百科知识,基本涵盖了大多数领域的百科知识,是一部内容自由、开放的电子版国际百科全书。

 

Copyright © 2023 OENC.NET All Rights Reserved
京ICP备2021023879号 更新时间:2024/9/21 12:40:04