Learn Git Rebase in 6 minutes // explained with live animations!

----

LINKS

MY TECH

MUSIC

DESCRIPTION
In this git rebase tutorial, I'll show you a different way of approaching git branching/merging with rebase. My team at Amazon adopted the workflow you'll see in the video and we love it. Whether you're mostly a solo developer or on a large team, give this a shot, I guarantee that even if you don't use rebase all the time, it will become an essential part of your development toolkit.

[mib]

Git must be explained with real examples and animations. This was the best tutorial I have seen on internet so far. Top quality content. Subscribed.

[JKhalaf]

Like the others mentioned, the animations really helped! thank you for taking the time to do them. ❤

[ErikBongers]

The way this is demonstrated with "live command typing" combined with "animated slides" is very intuitive! I imaging this takes quite some preparation/post-production. Thanks for that.

[lemonteateacup]

6 years later and this is still an amazing video! Super clear and intuitive, thank you!

[alexeyvolkov]

1. Rebasing master into the feature branch is dangerous if someone else working on that feature too.
2. Rebasing feature into master isn't a good solution, cause you can't revert all feature (if needed), you have to revert all commits one-by-one of that feature.
3. Git history can be nice and clean if you will merge features into the master with not allowing fast-forwarding and use "first-parent" when looking into log graph. In that case you will get just merge-commits which describes what that feature does and no other commits.
4. If you are working with tags, and, for example, track revisions of commits in your feature branch, rebasing will mix all tags into master.


so, as for me, rebasing sub-branches into feature branch after code review is a good idea, but rebasing into master or from master into feature branch doesn't look like a good solution

[thesavagesalmon]

Wow, I thought git rebase was complex, but you managed to explain it in under 7 minutes EXTREMELY clearly. The graphics really helped. Great work man. Thanks so much

[farstep]

I am a student at a Japanese University.
I study programming for myself.
Thank you for making good movies all the time.
I wish there was a super like button on YouTube 👍

[BlockCylinder]

This video has been up for longer than the duration of my career and I'm just now finding it. I've read or watched about 100 descriptions of Git rebase, with static diagrams of before and after, but they never really demonstrate the steps.

Really well done. I'm going to go try it right now.

[TranceJams]

If you'd like to preserve the idea of merge requests and approvals I recommend doing rebasing only on feature branches and when it's good to go open a PR to merge with master. This will help prevent damage being done in master as well.

[drew]

really love the way you organized things at 4minutes with the branch updating as you go. Even better than you showed local master vs remote master. Nicely explained as well.

[suraj]

this is the best video on rebase i found on youtube

[richardcrouch]

The extra time you have spent creating the animations is well worth it - especially recognising that at some point your local work has to be pushed up to the origin repo - this is the best video on rebasing I have come across - I've subscribed to your channel - thank you for creating this tutorial.

[bigsaves]

That lil animation with commits moving across speaks a thousand words. Well done. Will share with my team.

[rosscoguitar]

Thank you for explaining this so well. Almost 5 years later, this is still the best explanation of this on YouTube.

[CoryTheSimmons]

Best git video on YouTube. I've been using this strategy since 2013 and it's still the best approach I've found. I'd suggest just ignoring everything after 5:25 and just open a PR to the repo at that point. Then try to get your code reviewed/merged first so someone else has to deal with merge conflicts—otherwise you will have to rebase your PR frequently depending on the size of the team working on the repo.

[dataworksstudio]

Probably watched half a dozen videos...but nobody taught this concept better than u...the animations were ❤️

[ekvedaras]

This a very good demonstration 👍Props for that! However, I strongly advise against using rebase this way. Better avoid rebase all together. With bigger projects you will spend 10x more time on solving conflicts. There will be conflicts on files that your feature branch didn't even touch and often you need to solve conflicts on the same lines multiple times because rebase goes commit by commit. And all of this trouble and wasted time just for fewer lines history :) Those lines are very rarely needed anyway. Modern tools also can compare branches and list you missing commits from both sides and clearly show the state of branches. Git rebase is a very powerful tool but at the same time has potential to delete other people work because you need to do force push (or merge with remote again solving conflicts usually :)) ) Anyway, I left my 2 cents, thanks for reading and good luck 👍

[sanlep]

Thanks a lot! It seems like no one can explain how git works, so they make videos without graphs just talking in a confusing manner making it harder to understand. Thank you again!

[victorvillacis]

Bro, thanks so much!!!! really enjoyed the graphics on the video that went along with what you were saying.

[shahlodhi]

I haven't seen any git tutorial videos with this much animation and easy explanation.
Great work!!!