Skip to content

Merge Conflict - CI/CD用語集の定義

merge conflictは、2つのbranchがファイルの同じ領域を変更し、gitが自動的に選択できないときに生じます。mergeやrebaseを完了できるようにする前に、マーカーを手作業で解決しなければなりません。

関連ガイド

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…