An edit conflict is a computer problem that may occur when multiple editors edit the same
file
File or filing may refer to:
Mechanical tools and processes
* File (tool), a tool used to ''remove'' fine amounts of material from a workpiece
**Filing (metalworking), a material removal process in manufacturing
** Nail file, a tool used to gent ...
and cannot merge without losing part of their edits.
Description
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.
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 comparison
In computing, file comparison is the calculation and display of the differences and similarities between data objects, typically text files such as source code.
The methods, implementations, and results are typically called a diff, after the Un ...
s of each edit, so there are the previous versions of the file can still be accessed once the original is overwritten.
*
File locking
File locking is a mechanism that restricts access to a computer file, or to a region of a file, by allowing only one user or process to modify or delete it at a specific time and to prevent reading of the file while it's being modified or deleted ...
, which limits the file to one editor at a time to prevent edit conflicts. Computer writer Gary B. Shelly notes that many
wiki
A wiki ( ) is an online hypertext publication collaboratively edited and managed by its own audience, using a web browser. A typical wiki contains multiple pages for the subjects or scope of the project, and could be either open to the pub ...
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."
*
Merge
Merge, merging, or merger may refer to:
Concepts
* Merge (traffic), the reduction of the number of lanes on a road
* Merge (linguistics), a basic syntactic operation in generative syntax in the Minimalist Program
* Merger (politics), the comb ...
, 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
wiki
A wiki ( ) is an online hypertext publication collaboratively edited and managed by its own audience, using a web browser. A typical wiki contains multiple pages for the subjects or scope of the project, and could be either open to the pub ...
s (frequency higher in articles related to a current event or person),
distributed data systems (e.g.,
Google Sites
Google Sites is a structured wiki and web page creation tool included as part of the free, web-based Google Docs Editors suite offered by Google. The service also includes Google Docs, Google Sheets, Google Slides, Google Drawings, Google For ...
), and
revision control system
Revision Control System (RCS) is an early implementation of a version control system (VCS). It is a set of UNIX commands that allow multiple users to develop and maintain program code or documents. With RCS, users can make their own revisions of ...
s not using
file locking
File locking is a mechanism that restricts access to a computer file, or to a region of a file, by allowing only one user or process to modify or delete it at a specific time and to prevent reading of the file while it's being modified or deleted ...
,
[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".
as well as other high-traffic pages.
If a significant amount of new text is involved, the editor who receives an "edit conflict" error message can
cut and paste
In human–computer interaction and user interface design, cut, copy, and paste are related commands that offer an interprocess communication technique for transferring data through a computer's user interface. The ''cut'' command removes the ...
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
Copy editing (also known as copyediting and manuscript editing) is the process of revising written material ( copy) to improve readability and fitness, as well as ensuring that text is free of grammatical and factual errors. ''The Chicago Manual o ...
can be done directly on the newer version, and then saved.
See also
*
Concurrent Versions System
*
Apache Subversion
Apache Subversion (often abbreviated SVN, after its command name ''svn'') is a software versioning and revision control system distributed as open source under the Apache License. Software developers use Subversion to maintain current and histo ...
*
Git (software)
Git () is a distributed version control system: tracking changes in any set of files, usually used for coordinating work among programmers collaboratively developing source code during software development. Its goals include speed, data int ...
References
{{reflist
Wiki concepts
Version control
Distributed computing problems