By reading this post, you are going to really understand git merge, one of the most common operations you'll perform in your Git repositories. Merging

Git Merge – The Definitive Guide

submited by

Style Pass

2023-05-27 09:00:06

By reading this post, you are going to really understand git merge, one of the most common operations you'll perform in your Git repositories.

Merging is the process of combining the recent changes from several branches into a single new commit that will be on all those branches.

In a way, merging is the complement of branching in version control: a branch allows you to work simultaneously with others on a particular set of files, whereas a merge allows you to later combine separate work on branches that diverged from a common ancestor commit.

Remember that in Git, a branch is just a name pointing to a single commit. When we think about commits as being "on" a specific branch, they are actually reachable through the parent chain from the commit that the branch is pointing to.

You see the branch feature_1, which points to a commit with the SHA-1 value of ba0d2. Of course, as in other posts, I only write the first 5 digits of the SHA-1 value.