Git Merge vs Git Rebase

preview_player
Показать описание
In this video I walk through the differences between Git Merge and Git Rebase and my preferences in using both.

Gear:

Music by: Karl Casey @ White Bat Audio

Creative Commons — Attribution 3.0 Unported — CC BY 3.0

0:00 Intro
0:23 Git
3:31 Git Merge
8:43 Git Rebase
14:05 Preferences
15:09 Outro

#git #coding #programming
  1. Andrew Courter
Рекомендации по теме
Git MERGE vs 0:04:34

Git MERGE vs REBASE: Everything You Need to Know

Git MERGE vs 0:09:39

Git MERGE vs REBASE: The Definitive Guide

Git MERGE vs 0:16:12

Git MERGE vs REBASE

GIT: Merge или 0:10:47

GIT: Merge или Rebase? В чем разница?

Git Merge vs 0:22:24

Git Merge vs Git Rebase for Beginners

Learn Git Rebase 0:06:43

Learn Git Rebase in 6 minutes // explained with live animations!

git rebase - 0:09:45

git rebase - Why, When & How to fix conflicts

What is Git 0:01:53

What is Git Rebase?

Git Merge VS 0:12:22

Git Merge VS Rebase In REAL TIME | DevOps Shack

Git rebase tutorial. 0:07:48

Git rebase tutorial. Rebase vs Merge

Git Merge vs 0:18:10

Git Merge vs Git Rebase - Difference Between Merge and Rebase

Merge vs Rebase 0:02:21

Merge vs Rebase [Intermediate Git Tutorial]

Git merge vs. 0:14:26

Git merge vs. rebase (i jak robić to dobrze)

Git | Teil 0:09:44

Git | Teil 2 - Grundlagen | merge vs. rebase

Git & GitHub: 0:01:12

Git & GitHub: Rebasing

Git Rebase Vs. 0:19:59

Git Rebase Vs. Merge

Git merge and 0:02:31

Git merge and rebase. Main differences and which one to choose

Git Merge Vs 0:09:20

Git Merge Vs Rebase in 10Mins | @ConceptandCoding

Git merge vs 0:12:42

Git merge vs Git rebase

🤔 What’s the 0:00:39

🤔 What’s the difference between MERGING and REBASING in Git? #git #programming #shorts

Git Merge VS. 0:00:36

Git Merge VS. Git Rebase - What's the difference?

Git Rebase --interactive: 0:04:54

Git Rebase --interactive: EXPLAINED

Git Rebase vs 0:01:47

Git Rebase vs Merge | What is Git REBASE | What is REBASE | Git Merge

git merge vs 0:20:21

git merge vs rebase || git tutorial || git interview question || git rebase || git merge

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

It was brought up that git storing "diffs" is incorrect. Git stores a stream of snapshots and other VCSs store diffs between files. Git will not save anything for files that didn't change and only stores these snapshot references. Sorry for any confusion!

ascourter
Автор

Great explanations! Just one tiny thing, C2 single quote, is known as C2 prime. The single quote is a notation called 'prime'! Hope this helps a bit :)

droopfpv
Автор

Thanks for clearing up the Git merge conflict text. Currently trying to get enrolled into app academy.

emmanuelvillarreal
Автор

I'd argue that you should always rebase all your branches on master before merging, but then merge with --no-fast-forward to have the merge commits. This way you still have clean history but see the merged PRs/branches.

krzyczak
Автор

Really great explanation Andrew! That tool looks really useful, definitely going to play around with it.

muronuck
Автор

Nice explanation. First minutes about git history are unnecessary - you are answering a specific question.

jan.kowalski
Автор

Git obviously been named for Linus Torvalds as well....

gwaptiva
Автор

Whoa?! You had to do a rebase from bugfix....then move over to main to merge? Huh? The pic on the right looks like the code was updated...but then you had to change branches and do the merge....what looks like....again. I'm a bit confused sorry. Doesn't the rebase do that already? If it doesn't, couldn't you just do a merge from Main, and get the exact same results?

phenry
Автор

git keeps a full blob for every version of every file and they all get downloaded onto your machine when you clone a repo.

henri-philippemarceau
Автор

Do you use Git Merge or Git Rebase more often?

ascourter