Git Rebase vs Merge explained - Computer Stuff They Didn't Teach You #6

How do you use Git Rebase vs Git Merge? Is this the hardest part of Git? Let's see if Evil Mr. Spock and Scott can explain Git Rebase without pain!

[Apipoulai]

Scott’s voice in these videos is like the “fluffy clouds” timbre of Bob Ross.

Is Scott the Bob Ross of IT?
“Talent is a pursued interest. Anything that you're willing to practice, you can do.”

[raphaelkuttruf]

"When I merge code, I do it directly in production" ~ Scott 😂

[MrRogerdtaylor]

I’ve been using git for years but your descriptions are lovely and simple. Your the ‘Bob Ross’ of tech Scott. You start out with something that looks sketchy and end up with something that is simple and effectively explained. Great work, look forward to seeing more of your videos.

[tticom]

Thanks Scott, you made that way more understandable than the documentation.

[kishananem]

He is listening. We can request topics. Thanks Scott, am one of them who requested this topic....

[iliasaarab]

The only video series that I found that actually explains GIT from a practical pov while still covering the underlying frameworks. Love the PoP reference too!

[amador.e]

I have been using Git for a long time and definitely this is the simplest/smartest way to understand Git "Rebase". Thanks Scott, I always learn something interesting from your videos.

[RAHULXLASH]

Following your videos for 6 years now. It has been always been great to watch you. Always learned new things the best one is the trick to select text in VS with ALT key pressed. I have impressed many people with this trick.

[ArnonDanon]

Keep them comming scott...great content👍🏼

[sarcasmasaservice]

This is a great series, and you've made rebasing simple to understand, thank you so much! Your teaching style is something I aspire to. May I suggest workflows (gitflow or trunk-based development) and using git in code reviews as future topics?

[JesseTemple]

That blood sugar prompt is pretty slick. I used your block to set up posh git on my machine and love it! It pushed me toward using git CLI almost exclusively, vs a UI client.

[bikeshack]

These are some of the clearest explanations I've ever seen on yt

[datajunkie]

You don't know how much this helps me! Your channel is a gem

[andrewgreen]

Certainly demystified rebasing for me. Thanks for the great content. Keep it coming!

[Gozi]

This guy used Time Travel and Parallel Universes to explain git branches. Love it! From now on I'm naming the master/main branch - Earth Prime

[armaandhanji]

Thank you Scott! This is my favorite series!

[Rothbardo]

I like to listen to Hanselman videos before bed. His soothing voice makes me sleep instantly.

[dwaynenance]

Scott, I suggest drawing your commit/branch visuals with the arrows going from a commit to it's predecessor. I have found that not doing so can cause more debate than necessary about branching strategies

[thomashoddinott]

These are a fantastic set of videos on git. Personally I prefer merging, but use `rebase` heavily on feature branches (e.g. git rebase -i HEAD~3) to squash any superfluous commit messages down into fewer commits before opening a PR.

How about a video on resolving merge conflicts?

[JoshPeak]

Topic extension suggestion: Rebasing if you have already pushed your feature branch to a remote. The downsides of rewriting history if there is a copy of it elsewhere. That is where rebasing gets really tricky and git push --force is useful but not always available.