Git Rebase Vs. Merge

[@eltonjoshua5517]

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

[@chiragkhandelwal9178]

Finally he got his KZbin password 😂

[@dudeshamus1451]

The Return of the King

[@michellejefferson9232]

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.

[@Hermis14]

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

[@som.shekhar]

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

[@RameenFallschirmjager]

Welcome back Colt. You have a very special place in my heart. You helped me to jump start my career with your great courses.

[@akashnandan8253]

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

[@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

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

[@gaychin8654]

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

[@mauricioocon7839]

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!

[@carolpark]

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!

[@sunguru981]

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

[@shivashankarreddythatipart3811]

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

[@kyleronayne6445]

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

[@XlON___]

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

[@Chron1cles31098]

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!

[@aldoburbank]

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.

[@Maribobah81]

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

[@chrisanderson1513]

The visuals are crucial, thank you!

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

[@waldolemmer]

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]

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

[@arestlessmindband]

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

[@AngelosTeou]

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

[@yordanstoyanov9166]

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

[@frangimenez770]

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!

[@pcimring]

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

[@AnthonyCassidy50]

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)

[@heel57]

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

[@sahaneakanayaka3394]

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

[@KOFFrus]

the best video about the topic on KZbin

[@kavitakhandelwal5022]

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

[@pratyushshivam5335]

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

[@meritocratos]

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

[@yash1152]

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?

[@abelkalu5992]

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.

[@lllevokelll]

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.

[@emmanuelfabiani8435]

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

[@akhilnegi100]

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

[@muneebsami]

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

[@stevestrobel1678]

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

[@nikhilgoyal007]

thanks! great video - finally understood why rebasing can be dangerous (always read that but did not know why).

[@batmanasdasd]

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

[@mashab9129]

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

[@tecHSonic]

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

[@impooser]

Straightforward, simple, understandable. Thanks.

[@victortech3300]

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

[@nasrullahaljadid9135]

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

[@Palundrium]

If neither branch's history is "rewritten" with new commits at 9:25, why does git log show two new commits under master after merging at 9:00?

[@ironman5180]

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

[@jamesamo6962]

The explanation is awesome. Great work :)

[@tonycaravello4869]

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

[@user-zb5jp4ti1d]

Hi Colt, would be you be able to do a video on KZbin 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 :)

[@maplestoryinchinese]

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

[@wwhill8033]

Great video, thanks and welcome back!

[@Himanshu445]

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

[@remkeschuurmans8970]

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

[@mareimorsy3182]

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

[@surfinbird71]

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

[@bobo0612]

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

[@PrettyPennyClub]

Very useful explanation of these two similar techniques. 👍

[@guilhermecampos8313]

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

[@SoftwareTestSolutions]

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

[@thomasluk4319]

By this mean should I rebase from local main which is fetch to the latest and keep on developing the local features?

[@fezk3573]

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!

[@al-du6lb]

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

[@tryagain622]

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

[@HologramJay]

This might be a dumb question, but why not just pull the additions that were added to the master branch while you're on the feature branch? Wouldn't that give you the most recent commits made by the other co-workers?

[@binitrupakheti4246]

You cannot exactly pull them because the latest commit hash of the feature branch has changed. You merge main into feature to pull the commits instead.

[@iftakharhussain]

It's good to see you again.

[@sulekhagupta9019]

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

[@antonytomy7215]

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

[@richardingwe5211]

Colt, we missed you!

[@yorduminsani]

If only 1 person works on features then it's better to rebase feature but always merge into master right?

[@mihaideta9800]

nice tutorial, but dude can you do somthing about the add, i mean after they play the video restarts from 00.00 its annoying

[@tan2cang93]

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

[@vivianeb90]

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

[@yegorbenzyk9208]

topic isn't opened fully, how do you deal with conflicts?

[@tamaldas3544]

hey what is the git client software you are using ?

[@mistwire]

Yay! You switched to vscode! ❤

[@JamesScholesUK]

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]

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

[@froxx93]

Great video! Really well explained. Thanks a lot.

[@nekro9t2]

Are these slides available for download anywhere?

[@nico6465]

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

[@aramayis_mirzoyan]

The best explanation, thank you!

[@rezaulmasum205]

Do you have any plane to make any tutorial on AI with JS?

[@murugarajuperumalla5508]

super cool way of teaching, keep it up. 🙂

[@exvimmer]

Glad to see you again

[@nchatu]

A nice and clear explanation.

[@SergioGallego]

Loved the video, bought the udemy course :D

[@misterchef4239]

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!

[@gehanadel3616]

I like this explanation so much

[@yash1152]

1:18 2 yr ago: git switch how old is git switch??

[@yash1152]

3:02

[@heel57]

1) git switch feature; 2) git rebase master; I find it very confusing that the wording of the (2) is "rebase onto master" and not "rebase master onto feature". What is the logic here?

[@motif5775]

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

[@morriszin4742]

Hey colt, please do some mern stack apps tutorials . Pleasee

[@geldimyratalimov3921]

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

[@1etcetera1]

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

[@joey5069]

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

[@MrQVeeBoo]

Thank you this one is the best clearest.