A Toy Merging Example

Now, you’re going to run through a typical merging scenario by yourself.

Pre-merge#

Take a look at this diagram:

In this diagram, the repository is currently positioned at the tip of master (G). You know this because the HEAD is pointed at G.

Post-merge#

If you merge the experimental branch into master with a git merge experimental command, you end up with a tree that looks like this:

A new change has been made (I). This change merges together the changes made on experimental with the changes made on master.