You are signed in. Close

You are signed out. Close

Thank you. Your subscription has started. Close

Thank you. You will get an email when a new comic comes out. Close

We could not confirm your payment. If you paid, use the link "Sign in" at the bottom of the page. Close

Something went wrong on our side. Please try again in a moment. Close

Previous episode git switch: what really happens to your files when you change branch

How Git keeps every version of your project without filling your disk

Git fast-forward merge: what happens when only one branch moved

Some Git merges are over in a second: one strange word, Fast-forward, and not a single new commit. So what did the merge do?

  1. 1 The night sky is ready. You switch to main and run git merge night-mode, which asks Git to bring the night commits into main.night-modemainHEADyougit merge night-mode

    The night sky is ready. You switch to main and run git merge night-mode, which asks Git to bring the night commits into main.

  2. 2 It is over at once: Git prints "Fast-forward" and a short list of files. No new commit appears in the history, so what did Git do?youThat's it?GitFast-forward!

    It is over at once: Git prints "Fast-forward" and a short list of files. No new commit appears in the history, so what did Git do?

The rest of this episode is for subscribers

Subscribe to read every premium episode. You can cancel when you want.

Paid yearly: $99 instead of $119.88

Next episode Git merge: how two lines of work become one

Share this comic

More comics