An edit conflict, often referred to as a merge conflict in the context of version control systems, occurs when two or more contributors make changes to the same part of a document or file simultaneously or when their changes overlap in a way that the system cannot automatically determine which version should be preserved. Edit conflicts are common in collaborative environments, particularly in software development, wikis, and document collaboration platforms. When contributors attempt to merge their changes, the system encounters conflicting changes that need resolution.
New to topics? Read the docs here!