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 😂

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

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

[@dudeshamus1451]

The Return of the King

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

[@Hermis14]

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

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

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

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

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

[@gaychin8654]

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

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

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!

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

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

[@chrisanderson1513]

The visuals are crucial, thank you!

[@shivashankarreddythatipart3811]

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

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

[@kyleronayne6445]

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

[@KOFFrus]

the best video about the topic on KZbin

[@nikhilgoyal007]

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

[@XlON___]

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

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

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

[@sahaneakanayaka3394]

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

[@arestlessmind780]

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

[@Maribobah81]

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

[@meritocratos]

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

[@heel57]

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

[@pratyushshivam5335]

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

[@pcimring]

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

[@emmanuelfabiani8435]

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

[@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! :)

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

[@guilhermecampos8313]

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

[@remkeschuurmans8970]

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

[@impooser]

Straightforward, simple, understandable. Thanks.

[@akhilnegi100]

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

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

[@mashab9129]

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

[@batmanasdasd]

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

[@sulekhagupta9019]

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

[@jamesamo6962]

The explanation is awesome. Great work :)

[@tonycaravello4869]

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

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

[@bobo0612]

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

[@muneebsami]

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

[@maplestoryinchinese]

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

[@surfinbird71]

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

[@aramayis_mirzoyan]

The best explanation, thank you!

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

[@ironman5180]

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

[@SoftwareTestSolutions]

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

[@Himanshu445]

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

[@nchatu]

A nice and clear explanation.

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

[@froxx93]

Great video! Really well explained. Thanks a lot.

[@mareimorsy3182]

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

[@PrettyPennyClub]

Very useful explanation of these two similar techniques. 👍

[@wwhill8033]

Great video, thanks and welcome back!

[@vivianeb90]

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

[@gehanadel3616]

I like this explanation so much

[@tecHSonic]

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

[@MrQVeeBoo]

Thank you this one is the best clearest.

[@richardingwe5211]

Colt, we missed you!

[@ChwisKay]

can't help but notice you've spent "hours of work" on a BAR... sounds like the best life to me!

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

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

[@murugarajuperumalla5508]

super cool way of teaching, keep it up. 🙂

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

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

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

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

[@IgorogI1000]

reaaally good explanation

[@SergioGallego]

Loved the video, bought the udemy course :D

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

[@fabricedelannay7288]

It was very clear, thanks !

[@nico6465]

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

[@rico.worship]

Best explanation out there

[@mahesh113]

Well explained. Thanks!

[@jkjoker777]

Best freakin explanation, thanks

[@mistwire]

Yay! You switched to vscode! ❤

[@iftakharhussain]

It's good to see you again.

[@nasrullahaljadid9135]

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

[@prudhvichinnam1488]

Colt please do videos on KZbin 😎🙏

[@jd_addy]

Great teaching!

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

[@petedookway5989]

Very goood explanation. thanks

[@motif5775]

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

[@fatihhguvenn]

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

[@mohanant7557]

Great explanation

[@teethnclaws]

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

[@masturdOfTheUniverse]

Question, I think you answered this but I want to be sure. If I am working on a feature branch that I have merged into main at some point in the past and it now has new commits that main does not, should I never rebase on that branch again? Since main branch already has some commits from the past from feature, wouldn't any future rebase mess up the history by replaying that entire feature history on top of main that already has commits? This is what is confusing and leads me to think that branches other than main, once merged, should be destroyed to prevent a future rebasing with now shared history.

[@love_tacos]

I think you're absolutely correct here; I'm currently looking closer at the Warning (at 18:24) and i'm parsing the message of the warning. It seems like the point of rebase is to put all the commits OF A NEW FEATURE BRANCH at the front of the main/master branch history. Those commits are essentially "line-hopping" to the front of the line.....like a family of Karens jumping to the front of the line at Space Mountain. This way, when the PR is eventually merged, it'll be a fast-forward merge onto the remote repo. The warning seems to warn against rebasing commits that are already on the remote main/master. Which would happen if you re-open an old branch after it's been dormant for a while. Though that's just my interpretation as of right now.

[@tetley3737]

Good explanation 👍

[@sumankumary]

Awesome. Thank you so much.

[@al-du6lb]

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

[@kiwinesss]

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