Merge Commit

A merge commit is a type of commit in version control systems, particularly Git, that results from merging two or more branches. It has two or more parent commits, combining the histories of the merged branches into a single commit. This preserves the full history of development, including when and how branches were integrated.

Also known as: Merge, Git Merge, Merged Commit, Merge Strategy, Three-way Merge

Why learn Merge Commit?

Developers should use merge commits when they want to maintain a clear, linear history of branch integrations, such as in feature-based workflows or when collaborating on long-running branches. It's essential for documenting the merge event itself, making it easier to track when features were added or bugs were fixed, and is commonly used in strategies like Git Flow.

Learning Resources

• docs: Git Documentation - Merging
• tutorial: Atlassian Git Tutorial - Merging vs. Rebasing
• video: Git Merge Explained in 5 Minutes
• book: Pro Git Book - Branching and Merging