Squash Merge - CI/CD Glossary Definition
A squash merge combines all commits on a branch into a single commit when merging, so the target branch gets one clean commit instead of the full branch history.
Trade-off
You get a linear, readable main history at the cost of losing the intermediate commit granularity. Many teams enable squash merge as the only allowed merge method on protected branches.
Related guides
Three-Way Merge - CI/CD Glossary DefinitionThree-Way Merge: A three-way merge reconciles two diverged branches by comparing both tips against their comm…
Merge Conflict - CI/CD Glossary DefinitionMerge Conflict: A merge conflict occurs when Git cannot automatically reconcile two branches because both cha…
Pull Request - CI/CD Glossary DefinitionPull Request: A pull request (PR; merge request on GitLab) is a proposal to merge one branch into another. It…