Git Rebase Vs. Merge

  Рет қаралды 106,104

Colt Steele

Colt Steele

3 жыл бұрын

Get My Brand New Git & Github Course For $9.99 Through Saturday: www.udemy.com/course/git-and-...
In this video, we dive deep into two similar and confusing git concepts: merging and rebasing. Why do some people use rebase instead of merge? What's the golden rule of rebasing?! Why are people scared of rebasing?

Пікірлер: 146
@chiragkhandelwal9178
@chiragkhandelwal9178 3 жыл бұрын
Finally he got his KZfaq password 😂
@eltonjoshua5517
@eltonjoshua5517 3 жыл бұрын
Hey Colt, it's been a while, excited to see you posting courses again. Hope you're doing well :)
@gaychin8654
@gaychin8654 10 ай бұрын
Best git merge vs git rebase explanation I have found on YT!
@dudeshamus1451
@dudeshamus1451 3 жыл бұрын
The Return of the King
@michellejefferson9232
@michellejefferson9232 3 жыл бұрын
Your new git course is great I just purchased it yesterday. I'm familiar with the simple use cases for git but this course really takes git to another level for me.
@mauricioocon7839
@mauricioocon7839 3 жыл бұрын
Hi Colt, I'm currently taking your Git course and it is great, I want to point that I love your slides so far, they are concise and beautiful. I think they help a lot to improve my learing. Thank you!
@som.shekhar
@som.shekhar 3 жыл бұрын
The first thing I did when I woke up today is checked my email, found Udemy's notification about your new GIT course and I immediately bought the course. I had no plans of learning GIT, but I just love the way you teach, its amazing. And its my fourth course by you. I have learned a lot from your courses. BIG BIG THANKS!!
@Hermis14
@Hermis14 Жыл бұрын
This is the clearest explanation of the two commands I have seen on YT. Thank you!!
@akashnandan8253
@akashnandan8253 2 жыл бұрын
Hey colt , Thanks for all the courses . I started web development with your course on udemy and ever since loved development and coding . Haven't had an instructor on udemy who actually responds to queries and helps out . Just wantrd to thank you for the amazing course you put out there for new engineers
@RameenFallschirmjager
@RameenFallschirmjager 3 жыл бұрын
Welcome back Colt. You have a very special place in my heart. You helped me to jump start my career with your great courses.
@taqmobile
@taqmobile Жыл бұрын
Thank you so much for this video. I've checked a handful of websites and videos about these two and still had no idea what I was doing. You made this very easy to follow
@emmanuelfabiani8435
@emmanuelfabiani8435 3 жыл бұрын
Hey Colt, always very excited when you release new stuff! I think you're one of the most invaluable content creator.🙏🙏
@NaserMohdBaig
@NaserMohdBaig Жыл бұрын
I am a simple guy, I see Colt's courses, I buy them. I owe my livelihood to his simple explanations and great tutorials.
@carolpark
@carolpark 3 жыл бұрын
Happy to see you posting a new video! If possible, please continue to post more videos. We missed you. Hope you are well and safe!
@thEstRonG3r
@thEstRonG3r Жыл бұрын
Hey, So i haven't yet finished the whole video, but maaan, this was the best video i have seen about merge vs rebase. Not just that, but the explanation alone is great, very good job.
@aldoburbank
@aldoburbank 5 ай бұрын
This is one of the better treatments of Git Rebase (that I have seen). Perhaps it is so well done that it can accomplish the goal of demystifying rebase for most people to embrace it instead of maintaining a position why they don't believe in it.
@sahaneakanayaka3394
@sahaneakanayaka3394 3 жыл бұрын
Thank you for the git course... Love your courses and tutorials Colt 🙂🙂🙂
@frangimenez770
@frangimenez770 2 жыл бұрын
Thank you so much for this video! I was a little bit lost on which command use to merge two branches and as you said, rebase can be a little scary. This video cleared all my doubts. Again, thank you so much!
@kavitakhandelwal5022
@kavitakhandelwal5022 2 жыл бұрын
Such a helpful video! I was struggling for the explanation from a long time now. Couldn't understand from other resources! Thanks a lot! :)
@AngelosTeou
@AngelosTeou Жыл бұрын
Best video on Git I have seen so far on KZfaq.
@pratyushshivam5335
@pratyushshivam5335 3 жыл бұрын
Thankyou for being active and uploading new videos for us ✨ I'll definitely watch it.
@kyleronayne6445
@kyleronayne6445 Жыл бұрын
Best explanation I have seen on KZfaq. Thanks for putting this out here!
@XlON___
@XlON___ 3 жыл бұрын
My man with a new video. It's good to see you're finally back. Cheers!
@pcimring
@pcimring 2 жыл бұрын
Wow! A really superb video that simplifies a complex and confusing topic. Well done!!!
@Maribobah81
@Maribobah81 3 жыл бұрын
Welcome back, we've been missing u. Thanks for the course, already bought it
@sunguru981
@sunguru981 3 жыл бұрын
Was it just me, or did someone also felt that Colt is a fan of Marvel's WandaVision @ 7:25. Sorry, but just couldn't stop thinking this haha. Jokes apart, big fan of your work since 2016 :)
@meritocratos
@meritocratos 3 жыл бұрын
For last month I’ve been watching your developer Bootcamp on Udemy and it’s great. Thank you)
@shivashankarreddythatipart3811
@shivashankarreddythatipart3811 3 жыл бұрын
Bought the course already,Thank you colt. Can we expect any typescript course in near future?
@chrisanderson1513
@chrisanderson1513 Жыл бұрын
The visuals are crucial, thank you!
@arestlessmind780
@arestlessmind780 3 жыл бұрын
Great description, would love to buy the course when it goes back around 9.99!
@Chron1cles31098
@Chron1cles31098 3 жыл бұрын
Hey Colt! Currently restarted your Udemy Web Developer Bootcamp and saw that you had it updated for free. Thank you for that. You could have totally made a whole new course and charged separately (which still would be fine to do), but you didn't. So cheers!
@ironman5180
@ironman5180 2 жыл бұрын
Great video! Nicely explained. Nice figures. Good wrap up.
@vivianeb90
@vivianeb90 3 жыл бұрын
This is such a good tutorial! Thank you for this amazingly clear explanation.
@KOFFrus
@KOFFrus 3 жыл бұрын
the best video about the topic on KZfaq
@SoftwareTestSolutions
@SoftwareTestSolutions 3 жыл бұрын
I just love the approach and explanations. Thanks for the video!!!!
@yordanstoyanov9166
@yordanstoyanov9166 3 жыл бұрын
What a gem! Colti, please update your React Course. Much love x x
@mashab9129
@mashab9129 2 жыл бұрын
the best instructor - bought the course on udemy. thank you Colt.
@impooser
@impooser Жыл бұрын
Straightforward, simple, understandable. Thanks.
@akhilnegi100
@akhilnegi100 3 жыл бұрын
Watched multiple videos around Rebase vs Merge. Definitely would love to buy git course on Udemy soon. Thanks Colt
@Himanshu445
@Himanshu445 Жыл бұрын
Very helpful video and excellent represntation. Easy to understand. Thank you very much🙂
@wwhill8033
@wwhill8033 3 жыл бұрын
Great video, thanks and welcome back!
@jamesamo6962
@jamesamo6962 Жыл бұрын
The explanation is awesome. Great work :)
@abelkalu5992
@abelkalu5992 3 жыл бұрын
Hello Colt, it's really nice having you as a teacher, you are amazing. Please Colt I would love to know if you are planning on making an update on your advanced web dev bootcamp, please I would love a reply tothis as I want to get the course to finish up my web dev to-learns.
@victortech3300
@victortech3300 3 жыл бұрын
Hey Colt how are you doing , glad that you are back to relishing videos on youtube 😊, congrats on your web developer bootcamp course on udemy 👍😍
@mareimorsy3182
@mareimorsy3182 2 жыл бұрын
Thank you ... This is the best rebasing explanation so far
@froxx93
@froxx93 Жыл бұрын
Great video! Really well explained. Thanks a lot.
@PrettyPennyClub
@PrettyPennyClub 2 жыл бұрын
Very useful explanation of these two similar techniques. 👍
@heel57
@heel57 11 ай бұрын
great video - nicely fluent and paced. Would have loved the font a bit bigger in Kraken.
@nico6465
@nico6465 2 жыл бұрын
Great video, i 'm gonna add your course on my udemy wish list ! Thank you for this awesome explanation :)
@tecHSonic
@tecHSonic 3 жыл бұрын
any new courses coming up? btw your presentations have super awesome designs as always
@MrQVeeBoo
@MrQVeeBoo 2 жыл бұрын
Thank you this one is the best clearest.
@nchatu
@nchatu 2 жыл бұрын
A nice and clear explanation.
@remkeschuurmans8970
@remkeschuurmans8970 8 ай бұрын
very clear explanation of the difference between merging or rebasing .. +++ Thanks for sharing
@surfinbird71
@surfinbird71 3 жыл бұрын
Just bought the course. I look forward to hitting it hard.
@motif5775
@motif5775 2 жыл бұрын
Thank you for that great tutorial...I learned a lot!!
@muneebsami
@muneebsami 3 жыл бұрын
Bro, did you forget your youtube account password or something?
@sulekhagupta9019
@sulekhagupta9019 Жыл бұрын
After messing up so many times here i am solving everything on my own.
@aramayis_mirzoyan
@aramayis_mirzoyan 3 күн бұрын
The best explanation, thank you!
@tonycaravello4869
@tonycaravello4869 3 жыл бұрын
I've never really understood what the rebase command meant, until now 😄 thank you
@waldolemmer
@waldolemmer 2 жыл бұрын
I LOVE your videos! They're super clear. 18:50 - "don't rewrite history that other people have" Does that mean I shouldn't push a branch up if I plan to rebase it when I'm done?
@ajjitsabat9786
@ajjitsabat9786 2 жыл бұрын
you can still push but then after rebase you have to force push again but make sure no one else is working on the same branch
@murugarajuperumalla5508
@murugarajuperumalla5508 Жыл бұрын
super cool way of teaching, keep it up. 🙂
@fabricedelannay7288
@fabricedelannay7288 2 жыл бұрын
It was very clear, thanks !
@gehanadel3616
@gehanadel3616 Жыл бұрын
I like this explanation so much
@guilhermecampos8313
@guilhermecampos8313 Жыл бұрын
Very good explanation. Gonna keep an eye for you course. Gold material here.
@mahesh113
@mahesh113 Жыл бұрын
Well explained. Thanks!
@lllevokelll
@lllevokelll 3 жыл бұрын
My problem with rebasing is that the high volume rapid changes by multiple developers that make merge history muddled, are exactly the same kind of high volume rapid changes that make rebase a nightmare of there being an uncomfortably high likelihood someone has starting working off a commit that the rebase will disappear, making an awkward mess of things. The set of situations where rebase is useful but not dangerous are usually limited towards cleaning up a solo project or lower velocity small collab with one perpetually slow dev, vs addressing a swarm of parallel dev team work. Imho. Edit: also this tutorial and explanation were extremely well done. I am about to explore the course to see if I should recommend it to my teams newer devs for their next invest in yourself learning day. Great pacing, great visual diagrams.
@iftakharhussain
@iftakharhussain 3 жыл бұрын
It's good to see you again.
@bobo0612
@bobo0612 Жыл бұрын
its a fortune to watch this video for free, thank you!
@jd_addy
@jd_addy 3 жыл бұрын
Great teaching!
@maplestoryinchinese
@maplestoryinchinese 3 жыл бұрын
Can't believe he gave away the course for free!!
@fezk3573
@fezk3573 3 жыл бұрын
Awesome video Colt! I'm about to finish the web development bootcamp and its being amazing, you made me love web development! Thanks for the fantastic work!
@stevestrobel1678
@stevestrobel1678 3 жыл бұрын
Resetting master to undo merges is a nice way to demonstrate that the same effect can be achieved with rebasing. But (unless I am mistaken), you can't similarly undo a rebase. In a trivial example with no conflicts, that isn't a big deal. But if a merge gets really messy, you may not have the information needed to redo it and compare the results (unless maybe it is in the reflog).
@SergioGallego
@SergioGallego 5 ай бұрын
Loved the video, bought the udemy course :D
@petedookway5989
@petedookway5989 Жыл бұрын
Very goood explanation. thanks
@batmanasdasd
@batmanasdasd 3 жыл бұрын
Hey Steele how are you doing? Loving your beginners web dev course. I'm 14w
@nasrullahaljadid9135
@nasrullahaljadid9135 3 жыл бұрын
Sir, when you launch the Machine Learning course on udemy? I'm waiting for this course for a long time.
@rico.worship
@rico.worship 3 жыл бұрын
Best explanation out there
@exvimmer
@exvimmer 3 жыл бұрын
Glad to see you again
@IgorogI1000
@IgorogI1000 2 жыл бұрын
reaaally good explanation
@al-du6lb
@al-du6lb 3 жыл бұрын
Will you do a tutorial on neovim and all the amazing plugins? I see people using it and it looks awesome.
@tetley3737
@tetley3737 Жыл бұрын
Good explanation 👍
@richardingwe5211
@richardingwe5211 3 жыл бұрын
Colt, we missed you!
@mistwire
@mistwire 3 жыл бұрын
Yay! You switched to vscode! ❤
@AnthonyCassidy50
@AnthonyCassidy50 2 жыл бұрын
The image @ 12:00, illustrating a Rebase, is confusing because the bottom chain is labelled with both "Master" and "Feature". It would be clearer if that page showed the status of (before and after of) the master branch (ie it stays the same), and (the before and after of) the feature branch, ie its base is changed, but the commits between the tip and the base stay the same (like your excellent audio commentary says)
@mohanant7557
@mohanant7557 Жыл бұрын
Great explanation
@sumankumary
@sumankumary 3 жыл бұрын
Awesome. Thank you so much.
@tan2cang93
@tan2cang93 2 жыл бұрын
nice vid. and I see you are using new git command like switch instead of checkout. Now I am trying to use new command in order to separate the purpose. that's cool man
@tryagain622
@tryagain622 3 жыл бұрын
how about git pull origin master/main whats the difference between this and rebase? Thanks for the tutorial, Colt!
@antonytomy7215
@antonytomy7215 3 жыл бұрын
Hey colt, are you doing to redo the advanced web developer Bootcamp?
@yash1152
@yash1152 10 ай бұрын
14:53 wait, how's that prompt set up at the end of command line? and what happens when u enter a long or multiline command?
@salamiswami5456
@salamiswami5456 2 жыл бұрын
great stuff!
@thomasluk4319
@thomasluk4319 10 ай бұрын
By this mean should I rebase from local main which is fetch to the latest and keep on developing the local features?
@jkjoker777
@jkjoker777 2 жыл бұрын
Best freakin explanation, thanks
@puttenicole
@puttenicole 3 жыл бұрын
Good stuff!
@tamaldas3544
@tamaldas3544 2 жыл бұрын
hey what is the git client software you are using ?
@user-zb5jp4ti1d
@user-zb5jp4ti1d 3 жыл бұрын
Hi Colt, would be you be able to do a video on KZfaq or your udemy course about Git Large File Storage; i have a file over 50 MB that i push on to GitHub and I keep getting a warning; it would be great if you could break down Git LFS... not a lot of helpful videos on the same. Thanks :)
@aashayamballi
@aashayamballi 3 жыл бұрын
Welcome back
@kiwinesss
@kiwinesss 3 жыл бұрын
I bought it ... on section 4 already :)
@teethnclaws
@teethnclaws 3 жыл бұрын
Already got it, the moment I got the email ;)
@rbid
@rbid Жыл бұрын
thanks for the tip'
How To Squash Your Git History Like A Pro
13:09
Colt Steele
Рет қаралды 52 М.
Git Branching and Merging - Detailed Tutorial
54:28
SuperSimpleDev
Рет қаралды 183 М.
Climbing to 18M Subscribers 🎉
00:32
Matt Larose
Рет қаралды 16 МЛН
Creepy Teacher Kidnapped My Girlfriend?!
00:42
Alan Chikin Chow
Рет қаралды 15 МЛН
Купили айфон для собачки #shorts #iribaby
00:31
Git rebase is not that scary
21:44
Hitesh Choudhary
Рет қаралды 16 М.
So You Think You Know Git - FOSDEM 2024
47:00
GitButler
Рет қаралды 983 М.
Everything You'll Need to Know About Git with ThePrimeagen | Preview
14:43
GIT: Merge or Rebase? What's the difference?
10:47
Front-end Science із Сергієм Пузанковим
Рет қаралды 131 М.
Unix vs Linux
13:59
Gary Explains
Рет қаралды 1,6 МЛН
Git MERGE vs REBASE: The Definitive Guide
9:39
The Modern Coder
Рет қаралды 79 М.
Apple watch hidden camera
0:34
_vector_
Рет қаралды 59 МЛН
Очиститель экрана • 160418185                       Делюсь обзорами в профиле @lykofandrei
0:14
WWDC 2024 - June 10 | Apple
1:43:37
Apple
Рет қаралды 10 МЛН