Merge conflict
Also called conflict.
Example
One branchA branch is a named line of snapshots, so a new idea can grow beside the shared line. edits a page title while another branch deletes that page. GitGit is a version-control tool that records changes to files and helps people combine work over time. cannot pick a result on its own, so a person decides what the finished files should be.
Why it matters
GitGit is a version-control tool that records changes to files and helps people combine work over time. stops and asks a person to choose the finished result. A conflict is not only two edits to the same line. It can also happen when one change edits a file that another change deletes, or when nearby edits do not combine cleanly.
The site in a browser does not change until someone resolves the conflict, records the result, and deploys.
Common confusion
Conflict markers in a file are a pause in combining history. They are not, by themselves, a broken public site.
Sources
Updated September 30, 2026.