Glossary · Phase 11 · Professional practice
Merge conflict
When two branches changed the same lines differently, so Git can't combine them without a person deciding.
Try it now
The one rule: never rebase a branch other people have pulled.
Learn it properly
Git for teams · Branches, pull requests, rebasing and how a three-way merge finds conflicts. About 40 minutes.
Other terms from the same lesson
- git bisect: A Git command that binary-searches history to find the commit that introduced a bug.
- pull request: A request to merge a branch, where the change is reviewed, discussed and checked before it joins the main branch.
- rebase: Replaying your commits on top of another branch, giving a straight history with new commit ids.
- three-way merge: Combining two branches by comparing each with their last shared commit, the merge base.
- trunk-based development: A workflow where everyone merges small, short-lived branches into one main branch that is always deployable.
Never trained an AI?
Teach a small one to write, right in your browser. It takes about 20 seconds and needs no account.