Rebase vs Merge - CI/CD用語集の定義
rebase vs mergeは、rebase - 線形な履歴のためにcommitを最新のベース上へ再生する - と、merge commitを記録して真のbranchトポロジーを保つmergeとのトレードオフです。
関連ガイド
Merge Conflict - CI/CD Glossary DefinitionA merge conflict occurs when git cannot auto-reconcile changes to the same lines from two branches, requiring…
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…
Pull Request - CI/CD Glossary DefinitionA pull request proposes merging one branch into another, bundling the diff with discussion, reviews, and CI c…