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. 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 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.
The problem is encountered on wikis, distributed data systems (e.g., Google Sites), and revision control systems not using file locking. 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, 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 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.