Git rebase tutorial. Rebase vs Merge

Learn how to use Git Rebase and how is it different from Git Merge.

What will you learn in this Git tutorial:

- how to use git rebase to bring some else's code into your branch
- which branches to rebase and where merge is better option

1:15 - git rebase
4:28 - diagram
6:24 - git reflog

What else would like to learn about Git? Let me know in the comments.

Premium Online Courses for front end developers and designers.

[kevinlao]

Thanks for the video. I always had a rough understanding of git rebase vs git merge, but I was never taught when would be a good idea to use it for each use case.

[PrateekKapoormsa]

Thanks, bother, your diagrams/animations were a great help, without them it would have been difficult to get it

[iamdedlok]

Thanks for the video! That made understanding the basics of rebase easy and quick!

[ruixue]

1:15 git rebase
4:28 diagram
6:24 git reflog

[youssefdirani]

Essence of the video is here 4:24. Thanks I really learnt something.

[mvikashc]

Thank you, the explanation was precise and easy to understand.

[rahulsood]

I love this guy !
git Rebase: done and dusted. Thanks to this Guy.

[prakharshukla]

thankyou so much this helped me out a lot

[neithanm]

Hey mate! Where are you? Just discovered your channel, awesome material. I hope you can continue with more! 💪

[daniellaerachannel]

excellent Petr! I use rebase quiet often since I work as a fullstack

[ChessFlix]

Hi, great video! Would you mind mentioning what extension you're using to display the branch data in your terminal like that, just to the left of your cursor prompt? Thanks.

[mansourcodes]

I would like to thanks u brother, I have a full day trying to solve this lol

[rajeevsai]

Thanks for sharing this video. It's definitely helpful!

[shanmugakesavan]

Useful video. Got good understanding about Git Rebase. Thank you.

[AragornKI]

Thanks for the nice explanation of git merge vs git rebase

[dvirhanum]

Thanks for the explanation.
I prefer to use squash and merge most of the time since it allows to revert one commit in case of problem instead of reverting 20 commits if you use rebase. Moreover if you use merge without squash it is even harder. If you are following semantic release using the commits name, then it a lot reasonable to use squash since you want to version your product based on the commit names, fix, feat, !breaking changes. I think rebase can be nice thing when the order of commits is matter to you, or when you want to merge release branch to master and develop. I can't really think about a way that I would really want to use rebase instead of squash and merge. I would be glad if you will give me a scenario that I would need the rebase instead.
The thing that nice here is the interactive mode, that you can change the commit names and make it more friendly, but other than that, I can't really find a real advantage.

[raghubirsingh]

Thank you. It is really a very helpful video to on Git rebase.

[nodezera.a]

as you can imagine, you are a life-saver lol. Thank you for the explanation!

[Kayneb]

I don't hate tomatoes, but your channel name and icon are hilarious.

[SURA]

Thanks for the informative video. What would happen if there is merge conflict and how the commit history will look like in that scenario ? Can you please post some video on this scenario ?