Merge Conflict - CI/CD Glossary Definition
A merge conflict arises when two branches change the same region of a file and git cannot pick automatically. The markers must be resolved by hand before the merge or rebase can complete.
Related guides
Rebase vs Merge - CI/CD Glossary DefinitionRebase vs merge is the choice between replaying commits onto the target for a linear history, or joining bran…
Pull Request - CI/CD Glossary DefinitionA pull request proposes merging one branch into another, bundling the diff with discussion, reviews, and CI c…
Squash Commit - CI/CD Glossary DefinitionA squash commit collapses all commits on a branch into one before merging, giving the main branch a clean, si…