page_title: Edit conflict
hierarchical_section_title: Edit conflict
caption_attribution_description: English: How the new approach for the edit conflict interface works in the world of cats and goats
context_page_description: 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.
context_section_description: 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.
caption: 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.
exif: {}