Merge is the operation that integrates changes from one branch into another, producing a single history that reflects both sets of commits. It creates a new merge commit (or advances the branch with a fast-forward, depending on the strategy) and reconciles divergent changes, often requiring conflict resolution when the same lines or files were modified differently. Three-way merge logic compares the two branch tips against their common ancestor to determine the minimal set of changes needed. Typical strategies include fast-forward, no-fast-forward (creating an explicit merge commit), and squash merges, each with trade-offs for traceability and history cleanliness.

Playbooks

Merge

Combines two branches, resolves conflicts, produces a new history.

‌

‌

‌

‌

Recent Views

Recent Views

‌

‌

‌