So what's the difference between 'git merge' and 'git rebase'?

preview_player
Показать описание
Someone told you that you should use "rebase" rather than "merge"? Not sure what we are talking about? Let's explore the difference.

Also, if you wanna learn more about Git, I've created a 30min course that gives you all you need to successfully work with it on a day to day basis:

  1. Juri Strumpflohner
  2. git
  3. software development
  4. tooling
  5. productivity
Рекомендации по теме
SO and SUCH 0:09:14

SO and SUCH - What's the difference? IMPROVE your ENGLISH!

Difference between So 0:07:07

Difference between So and Because (English Grammar)

English Lesson - 0:10:07

English Lesson - Learn the difference between 'So', 'Very' & 'Too'...

Basic English: Learn 0:09:47

Basic English: Learn the difference between BECAUSE and SO

🔥 EASY! The 0:08:45

🔥 EASY! The difference between EVEN IF, EVEN THOUGH, EVEN SO and EVEN!

English Grammar lesson 0:09:40

English Grammar lesson - Difference between A lot, Very & So.

What's the difference 0:07:48

What's the difference between There, Their and They're? - English Grammar Lesson

Difference between the 0:10:43

Difference between the pronouns This, That, These and Those – English Grammar lesson

So vs too/What 0:00:53

So vs too/What is the difference between so and too

Its vs It's 0:01:29

Its vs It's - Difference between Its and It's

Difference between ANSWER, 0:09:33

Difference between ANSWER, REPLY and RESPOND - Basic English Grammar

🤔 What's The 0:05:53

🤔 What's The Difference Between IN ORDER TO, SO THAT and TO? | Learn English Grammar

The difference between 0:10:04

The difference between ‘when’ and ‘while’ – Spoken English Lesson

Difference between 'So' 0:11:03

Difference between 'So' & 'Neither' - English Grammar lesson

To / Too 0:02:47

To / Too / Two - What is the Difference? | Homophones English Grammar ESL Mini Lesson

Sociopathy vs Psychopathy 0:04:45

Sociopathy vs Psychopathy - What's The Difference?

Difference between - 0:08:26

Difference between - Even though, Even if, Even when & Even so - Free English lesson

What is the 0:02:02

What is the difference between Cmd, PowerShell, and Bash? | One Dev Question

YOUR vs YOU'RE 0:02:19

YOUR vs YOU'RE 🤔| What's the difference? | Learn with examples

Difference between so 0:02:37

Difference between so many, so much, too many, and too much!

Difference between Baking 0:01:00

Difference between Baking Soda and Baking Powder in 60 seconds - Warren Nash

What's the Difference 0:01:08

What's the Difference Between Pool Cue Tip Diameters?

Biggest Difference Between 0:05:52

Biggest Difference Between Bad Art and Great Art by UCLA Professor Richard Walter

The difference between 0:07:40

The difference between ‘of ‘and ‘off’ – Free Spoken English Lessons

Комментарии
Автор

Thank you Juri, you just changed the way I visualize branches...I feel like a new man ..Thanks

temiloluwaawoyele
Автор

Awesome video and the best explanation I've seen on rebase so far. Other tutorials simply stated that rebasing onto master will cause master to have the same commit history, without specifying that a merge, or another rebase was necessary. Your explanation was clear, well-illustrated and straight to the point. You rock!

praisedare
Автор

Thanks. What if after the rebase, master has updated again plus more work has committed to the feature branch. Do you need to do another rebase master? Thank you

markchai
Автор

So when you 'git rebase' you actually change branch ? you were on myFeat and after rebase, you are on master ?

fabiodelorenzo