Learn
Conflict
When two branches changed the same line and a human must choose which version to keep during a mergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees..
Why this word exists
Two good edits can still collide. A conflict is when two branches changed the same line and a human must choose during mergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees. — a pause, not a cursed site.
Botski tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out. talk treats conflicts as normal shop weather. Resolve, then continue the tip trainA line of finished changes waiting to be tipped (reviewed and shipped) one after another..
Where you will meet it
MergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees. and PRA pull request is a review page that asks a human to look at a branch before those changes join main. notes mention conflicts. This Desk draftWork saved or opened for review that is not the live tip yet (see also draft vs tip). does not merge or tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out. anything.
Examples
- Glossary and DirectoryThe public catalog of guides, tools, stack, games, creators, and articles on Botski. tips both touch the same nav file — mergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees. conflict asks a human.
- Rebasing onto newer mainMain is the shared branch this site treats as the current source. can surface conflicts earlier than a late mergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees..
- Conflict markers in a file are not liveOn the public website right now so visitors can see it — the opposite of cooking or draft. until someone resolves and deploys.
Fetched 2026-09-23 CT.