Software Engineering KB

Home

❯

06 Development Process

❯

00 Version Control

❯

01 Concept

❯

Merge Commits

Merge Commits

Feb 10, 20261 min read

  • git
  • merging
  • merge-commits

Merge Commits

← Back to Branching and Merging

Preserve branch history with a merge commit node that has two parents. The full history of the branch is visible in the graph. Creates a non-linear history but makes it clear when branches were integrated.

Key Properties

  • Two Parent Commit
  • Branch History Preservation
  • Non-Linear History

Related

  • Rebase (alternative: linear history)
  • Squash Merge (alternative: single commit)

git merging merge-commits


Graph View

  • Merge Commits
  • Key Properties
  • Related

Backlinks

  • Branching and Merging
  • Cherry-Pick
  • Conflict Resolution (Version Control)
  • Rebase
  • Squash Merge

Created with Quartz v4.5.2 © 2026

  • GitHub