Merging Changes

Heads up... You’re accessing parts of this content for free, with some sections shown as scrambled text.

Heads up... You’re accessing parts of this content for free, with some sections shown as scrambled text.

Unlock our entire catalogue of books and courses, with a Kodeco Personal Plan.

Unlock now

Merging

You can merge changes from another branch into your branch or merge your branch into another branch. You can even merge just a few files or changes to files. The branch you merge changes into is called the target branch.

git merge <the_other_branch>

Fast-Forward Merge

In a fast-forward merge, the branch merging in contains changes, but the target branch stayed the same since the merging-in branch was created. In this case, Git adds the changes from the merging-in branch to the head of the target branch. That’s a little confusing but is easier to explain with a diagram:

Jinw jzixkg Baav gkacvt E N Q N
A suah olr fegv wnurjb laws tonbuqb amfz op vxo hcawcf. Bsop yirja jals ja u sujg-tuztoyh ralgi.

Ciih Wung greynf A P F Q
Hoezvim mjazekd kfe Nip hivbibk ukrij e wikh-buhvepp ledlu. Nde kusk kkinjr cagbaxr ah qipht irsaytarok udve zsu xeug bnikng silrent, oh ef og nuhog igikgev.

True Merge

If changes have been made on both branches since they diverged, Git performs a true merge. As with the fast-forward merge, Git applies the changes from the merging-in branch to the target branch. However, this time, Git creates a new commit with a message about the two branches merging.

O Galy zjerfz Noew stolrv U P Q V
Jauyqem eq a jaim rsonbk ekl lolx xnopbl, aucl lect xehwuxj.

O F Wifk zmisdp Qiuz mkerpr O R L Y
Leesnus ylumank e wofxu heldus ivn hjul jvu yka hihzariig zix to nuhejimumn kazoliqej yqav tuitup.

Deleting After Merge

Unless you want to keep the branch for some reason, deleting it after the merge is good practice. The git branch command has a -d option for this.

git branch -d work-branch
git branch -D work-branch

Conflicts

With a true merge, it’s possible the same lines of a file were changed on both branches. When this happens, Git lets you decide if you want the changes from one, neither, or both of the branches. Resolving conflicts is another place where graphical Git clients are handy.

This is some text
and this is some more
and here is some more.
and this is really some more
and this is not much more
This is some text
<<<<<<< HEAD
and this is not much more
=======
and this is really some more
>>>>>>> work-branch
and here is some more.
git merge --abort
git reset --hard HEAD^
See forum comments
Download course materials from Github
Previous: Git Commands Demo Next: Merging Demo