Glossary
What Is a Git Merge?
A merge takes the work from one branch and combines it into another. It’s how a finished feature or fix makes its way back into the main version of your project.
How it fits the workflow
- Build a feature on a branch.
- Review it (often via a pull request).
- Merge it into
main.
When two branches change the same lines differently, you get a merge conflict — which Git helps you resolve by hand.