Getting Solid at Git Merge vs. Rebase by Delicious Insights

Getting Solid at Git Merge vs. Rebase

The ability to groom a coherent, useful, clean history relies on being able to clean up your work and merge branches properly. The merge and rebase commands, when properly used, are great sidekicks to achieve this.

Make your history a pleasure to read!

You should only merge to bring an entire finalized feature branch in, so as to preserve a semantically consistent and useful history graph, which offers some solid added value.

In addition, rebase is, however you use it (classic, three-point, interactive or cherry-pick), an amazing Swiss-army knife to refactor and cleanup your history so it is in optimal shape.

In this video course, we walk you through the semantics, strengths and best uses of merge and rebase. You’ll learn when each best applies, and we’ll give you all the keys to maintain an impeccable history.

So what’s in this course?

Besides all streaming videos, you’ll also get single download links for downloading the entire video archive and the whole set of example and exercise repos.

Welcome! (intro and outline)
Differents purposes
  • A clean, readable and useful history
  • When should I use merge?
  • When should I use rebase?
Workflow first principles
Merging a branch, the smart way
  • The merge command and its options
  • Dang! I should have merged later, undo!
  • The specific case of “persistent” branches
Grooming my history using rebase
  • Understanding cherry-pick to better understand rebase
  • The rebase command and its options
  • Deep-dive into Interactive rebasing (rewording, dropping, splitting, squashing, reordering…)
  • Practical use-cases for rebases
  • Automatic stashing around a rebase
  • ZOMG! I did an inverted rebase! Undo!
  • Dang! My local branch got all flattened out.
The git pull trap
  • Pull: a two-step dance
  • Understanding the steps of a merge-mode pull
  • Understanding the steps of a rebase-mode pull
  • The tricky case of rebasing a local merge
Final boss: cleanup + merge exercise
And we’re done! 😭
  • Want more video content?
  • Further reading…

Animated diagrams galore

To make sure it all clicks for you, Maxime spared no effort crafting wonderful animated diagrams. You’ll see how efficient this is to finally bring some light and clarity!


😎 Should I already know Git?

You would preferably already have some Git experience, yes, otherwise you’ll have a harder time picturing yourself in the situations we describe to best understand how valuable the solutions we present are.

🎁 Do you provide the code samples too?

Of course we do! The course opening has a link to a Zip file with all the sample repositories, ready for your own trials and tweaks.

📥 Can I download the videos for offline viewing?

Yes! The course opening contains a link to a Zip file with all the MP4 video files, that you can download to view or review when you’re offline. Note that a low bandwidth is enough to watch them online, though, and that gets you extras like transcripts and related contents.

🆓 Do you offer other free Git-related content?

Do we ever! Our tech articles on Git are many and in-depth; you'll also find a number of videos from our conference talks or meetups about Git and how to streamline your workflows with it. Some examples:

🎓 Do you do in-room trainings?

We sure do! We probably offer one of the world’s best Git trainings: 360° Git. 3 days to explore Git in-depth, from scratch, unlocking all its power and with tons of hands-on practical exercises.

A course by Maxime

Maxime Bréhin has been using Git daily since 2008, and has been a professional trainer on it since 2015. An expert on Git and on the productivity and workflow boosts it enables, Maxime gives you all the keys here to make the best, smart use of these two must-know commands so that your features, stories and workflows are best rendered in a flawless history graph.