Edit conflict

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.

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

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.