Git Rebase Vs. Merge

Ғылым және технология

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

  • @eltonjoshua5517
    @eltonjoshua55173 жыл бұрын

    Hey Colt, it's been a while, excited to see you posting courses again. Hope you're doing well :)

  • @chiragkhandelwal9178
    @chiragkhandelwal91783 жыл бұрын

    Finally he got his KZread password 😂

  • @dudeshamus1451
    @dudeshamus14513 жыл бұрын

    The Return of the King

  • @mauricioocon7839
    @mauricioocon78393 жыл бұрын

    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.shekhar3 жыл бұрын

    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!!

  • @michellejefferson9232
    @michellejefferson92323 жыл бұрын

    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.

  • @akashnandan8253
    @akashnandan82532 жыл бұрын

    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

  • @gaychin8654
    @gaychin865410 ай бұрын

    Best git merge vs git rebase explanation I have found on YT!

  • @RameenFallschirmjager
    @RameenFallschirmjager3 жыл бұрын

    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
    @emmanuelfabiani84353 жыл бұрын

    Hey Colt, always very excited when you release new stuff! I think you're one of the most invaluable content creator.🙏🙏

  • @Hermis14
    @Hermis14 Жыл бұрын

    This is the clearest explanation of the two commands I have seen on YT. Thank you!!

  • @carolpark
    @carolpark3 жыл бұрын

    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!

  • @frangimenez770
    @frangimenez7702 жыл бұрын

    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!

  • @pratyushshivam5335
    @pratyushshivam53353 жыл бұрын

    Thankyou for being active and uploading new videos for us ✨ I'll definitely watch it.

  • @kavitakhandelwal5022
    @kavitakhandelwal50222 жыл бұрын

    Such a helpful video! I was struggling for the explanation from a long time now. Couldn't understand from other resources! Thanks a lot! :)

  • @XlON___
    @XlON___3 жыл бұрын

    My man with a new video. It's good to see you're finally back. Cheers!

  • @sahaneakanayaka3394
    @sahaneakanayaka33943 жыл бұрын

    Thank you for the git course... Love your courses and tutorials Colt 🙂🙂🙂

  • @pcimring
    @pcimring2 жыл бұрын

    Wow! A really superb video that simplifies a complex and confusing topic. Well done!!!

  • @Maribobah81
    @Maribobah813 жыл бұрын

    Welcome back, we've been missing u. Thanks for the course, already bought it

  • @kyleronayne6445
    @kyleronayne6445 Жыл бұрын

    Best explanation I have seen on KZread. Thanks for putting this out here!

  • @meritocratos
    @meritocratos3 жыл бұрын

    For last month I’ve been watching your developer Bootcamp on Udemy and it’s great. Thank you)

  • @Chron1cles31098
    @Chron1cles310983 жыл бұрын

    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!

  • @arestlessmind780
    @arestlessmind7803 жыл бұрын

    Great description, would love to buy the course when it goes back around 9.99!

  • @aldoburbank
    @aldoburbank5 ай бұрын

    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.

  • @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.

  • @shivashankarreddythatipart3811
    @shivashankarreddythatipart38113 жыл бұрын

    Bought the course already,Thank you colt. Can we expect any typescript course in near future?

  • @sunguru981
    @sunguru9813 жыл бұрын

    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 :)

  • @chrisanderson1513
    @chrisanderson1513 Жыл бұрын

    The visuals are crucial, thank you!

  • @vivianeb90
    @vivianeb903 жыл бұрын

    This is such a good tutorial! Thank you for this amazingly clear explanation.

  • @akhilnegi100
    @akhilnegi1003 жыл бұрын

    Watched multiple videos around Rebase vs Merge. Definitely would love to buy git course on Udemy soon. Thanks Colt

  • @SoftwareTestSolutions
    @SoftwareTestSolutions3 жыл бұрын

    I just love the approach and explanations. Thanks for the video!!!!

  • @ironman5180
    @ironman51802 жыл бұрын

    Great video! Nicely explained. Nice figures. Good wrap up.

  • @abelkalu5992
    @abelkalu59923 жыл бұрын

    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.

  • @yordanstoyanov9166
    @yordanstoyanov91663 жыл бұрын

    What a gem! Colti, please update your React Course. Much love x x

  • @victortech3300
    @victortech33003 жыл бұрын

    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 👍😍

  • @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.

  • @wwhill8033
    @wwhill80333 жыл бұрын

    Great video, thanks and welcome back!

  • @mashab9129
    @mashab91292 жыл бұрын

    the best instructor - bought the course on udemy. thank you Colt.

  • @Himanshu445
    @Himanshu445 Жыл бұрын

    Very helpful video and excellent represntation. Easy to understand. Thank you very much🙂

  • @impooser
    @impooser Жыл бұрын

    Straightforward, simple, understandable. Thanks.

  • @jamesamo6962
    @jamesamo6962 Жыл бұрын

    The explanation is awesome. Great work :)

  • @heel57
    @heel5711 ай бұрын

    great video - nicely fluent and paced. Would have loved the font a bit bigger in Kraken.

  • @mareimorsy3182
    @mareimorsy31822 жыл бұрын

    Thank you ... This is the best rebasing explanation so far

  • @fezk3573
    @fezk35733 жыл бұрын

    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!

  • @AngelosTeou
    @AngelosTeou Жыл бұрын

    Best video on Git I have seen so far on KZread.

  • @nico6465
    @nico64652 жыл бұрын

    Great video, i 'm gonna add your course on my udemy wish list ! Thank you for this awesome explanation :)

  • @froxx93
    @froxx93 Жыл бұрын

    Great video! Really well explained. Thanks a lot.

  • @PrettyPennyClub
    @PrettyPennyClub2 жыл бұрын

    Very useful explanation of these two similar techniques. 👍

  • @KOFFrus
    @KOFFrus3 жыл бұрын

    the best video about the topic on KZread

  • @remkeschuurmans8970
    @remkeschuurmans89709 ай бұрын

    very clear explanation of the difference between merging or rebasing .. +++ Thanks for sharing

  • @lllevokelll
    @lllevokelll3 жыл бұрын

    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.

  • @surfinbird71
    @surfinbird713 жыл бұрын

    Just bought the course. I look forward to hitting it hard.

  • @waldolemmer
    @waldolemmer2 жыл бұрын

    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

  • @tecHSonic
    @tecHSonic3 жыл бұрын

    any new courses coming up? btw your presentations have super awesome designs as always

  • @motif5775
    @motif57752 жыл бұрын

    Thank you for that great tutorial...I learned a lot!!

  • @AnthonyCassidy50
    @AnthonyCassidy502 жыл бұрын

    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)

  • @stevestrobel1678
    @stevestrobel16783 жыл бұрын

    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).

  • @tonycaravello4869
    @tonycaravello48693 жыл бұрын

    I've never really understood what the rebase command meant, until now 😄 thank you

  • @aramayis_mirzoyan
    @aramayis_mirzoyan7 күн бұрын

    The best explanation, thank you!

  • @nchatu
    @nchatu2 жыл бұрын

    A nice and clear explanation.

  • @guilhermecampos8313
    @guilhermecampos8313 Жыл бұрын

    Very good explanation. Gonna keep an eye for you course. Gold material here.

  • @MrQVeeBoo
    @MrQVeeBoo2 жыл бұрын

    Thank you this one is the best clearest.

  • @tan2cang93
    @tan2cang932 жыл бұрын

    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

  • @batmanasdasd
    @batmanasdasd3 жыл бұрын

    Hey Steele how are you doing? Loving your beginners web dev course. I'm 14w

  • @murugarajuperumalla5508
    @murugarajuperumalla5508 Жыл бұрын

    super cool way of teaching, keep it up. 🙂

  • @gehanadel3616
    @gehanadel3616 Жыл бұрын

    I like this explanation so much

  • @fabricedelannay7288
    @fabricedelannay72882 жыл бұрын

    It was very clear, thanks !

  • @mahesh113
    @mahesh113 Жыл бұрын

    Well explained. Thanks!

  • @al-du6lb
    @al-du6lb3 жыл бұрын

    Will you do a tutorial on neovim and all the amazing plugins? I see people using it and it looks awesome.

  • @iftakharhussain
    @iftakharhussain3 жыл бұрын

    It's good to see you again.

  • @SergioGallego
    @SergioGallego5 ай бұрын

    Loved the video, bought the udemy course :D

  • @petedookway5989
    @petedookway5989 Жыл бұрын

    Very goood explanation. thanks

  • @jd_addy
    @jd_addy3 жыл бұрын

    Great teaching!

  • @mistwire
    @mistwire3 жыл бұрын

    Yay! You switched to vscode! ❤

  • @sulekhagupta9019
    @sulekhagupta9019 Жыл бұрын

    After messing up so many times here i am solving everything on my own.

  • @exvimmer
    @exvimmer3 жыл бұрын

    Glad to see you again

  • @richardingwe5211
    @richardingwe52113 жыл бұрын

    Colt, we missed you!

  • @IgorogI1000
    @IgorogI10002 жыл бұрын

    reaaally good explanation

  • @nasrullahaljadid9135
    @nasrullahaljadid91353 жыл бұрын

    Sir, when you launch the Machine Learning course on udemy? I'm waiting for this course for a long time.

  • @tetley3737
    @tetley3737 Жыл бұрын

    Good explanation 👍

  • @sumankumary
    @sumankumary3 жыл бұрын

    Awesome. Thank you so much.

  • @maplestoryinchinese
    @maplestoryinchinese3 жыл бұрын

    Can't believe he gave away the course for free!!

  • @bobo0612
    @bobo0612 Жыл бұрын

    its a fortune to watch this video for free, thank you!

  • @rico.worship
    @rico.worship3 жыл бұрын

    Best explanation out there

  • @mohanant7557
    @mohanant7557 Жыл бұрын

    Great explanation

  • @jkjoker777
    @jkjoker7772 жыл бұрын

    Best freakin explanation, thanks

  • @geldimyratalimov3921
    @geldimyratalimov39213 жыл бұрын

    Thanks a lot for your courses man! Could u make React Native course also!!!

  • @kiwinesss
    @kiwinesss3 жыл бұрын

    I bought it ... on section 4 already :)

  • @tryagain622
    @tryagain6223 жыл бұрын

    how about git pull origin master/main whats the difference between this and rebase? Thanks for the tutorial, Colt!

  • @antonytomy7215
    @antonytomy72153 жыл бұрын

    Hey colt, are you doing to redo the advanced web developer Bootcamp?

  • @salamiswami5456
    @salamiswami54562 жыл бұрын

    great stuff!

  • @joey5069
    @joey50693 жыл бұрын

    damn, I missed the sale. I'm gonna buy it as soon as It goes in sale again.

  • @1etcetera1
    @1etcetera13 жыл бұрын

    nice chickens. we need now more Blue in your courses!

  • @yash1152
    @yash115210 ай бұрын

    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?

  • @muneebsami
    @muneebsami3 жыл бұрын

    Bro, did you forget your youtube account password or something?

  • @teethnclaws
    @teethnclaws3 жыл бұрын

    Already got it, the moment I got the email ;)

  • @puttenicole
    @puttenicole3 жыл бұрын

    Good stuff!

  • @JamesScholesUK
    @JamesScholesUK3 жыл бұрын

    Great explanation. I find that in a small team, where any feature usually only has one owner rebasing by default is usually fine. One thing: given Github's move to use `main` as the default branch to avoid any negative connotations, is this something you're planning to embrace going forward?

  • @TokyoXtreme

    @TokyoXtreme

    2 жыл бұрын

    It’s getting tricky to master one’s craft when the terminology changes arbitrarily.

  • @misterchef4239
    @misterchef42393 жыл бұрын

    Colt, create a WebAR course on Udemy. There's a lack of AR courses, so you should break it! Or if AR apps, do with React Native. There's high demand!

Келесі