Git - Rebase | Merge | Merge --Squash!!!

preview_player
Показать описание
Learn about Git MERGE and REBASE and why you may want to use these commands!!!

My Social Links

Enjoy ;-)
  1. Joe
  2. git
  3. github
  4. bitbucket
  5. version control
Рекомендации по теме
Git MERGE vs 0:04:34

Git MERGE vs REBASE: Everything You Need to Know

Learn Git Rebase 0:06:43

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

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 vs 0:22:24

Git Merge vs Git Rebase for Beginners

git rebase - 0:09:45

git rebase - Why, When & How to fix conflicts

GIT: Merge или 0:10:47

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

Git rebase tutorial. 0:07:48

Git rebase tutorial. Rebase vs Merge

Git Merge VS 0:12:22

Git Merge VS Rebase In REAL TIME | DevOps Shack

What is Git 0:01:53

What is Git Rebase?

Git Rebase --interactive: 0:04:54

Git Rebase --interactive: EXPLAINED

Merge vs Rebase 0:02:21

Merge vs Rebase [Intermediate Git Tutorial]

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 | Teil 0:09:44

Git | Teil 2 - Grundlagen | merge vs. rebase

Git merge vs. 0:14:27

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

Git Rebase Interactive 0:02:50

Git Rebase Interactive :: A Practical Example

Git Merge Vs 0:09:20

Git Merge Vs Rebase in 10Mins | Backend Software Developer

Git Merge vs 0:00:35

Git Merge vs Git Rebase - What is Better?

How to Close 0:06:09

How to Close a Pull Request - Merge Commit vs Squash vs Rebase on GitHub

Git Rebase - 0:04:49

Git Rebase - Einfach und praktisch erklärt

Git Merge VS. 0:00:36

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

Git Rebase in 0:02:28

Git Rebase in any JetBrains IDE

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

Finally! Can't believe this actually made sense. Thanks for the video! :)

CaiCruz
Автор

Nice Joe! Appreciated the examples and comparison between the 3 approaches. Even though the jokes were “corny”, still got me laughing out loud. Keep ‘em coming!

amarisi
Автор

Thank you for the video! Summary:

MERGE

- merge the selected branch into the current branch
- creates automatic merge commit
- shows complete commit history in chronological order

git checkout master
git merge feature
git log --oneline

c93e75e (HEAD -> master) Merge branch 'feature'
eb89cfa (feature) feature file 2
0ffc6c8 master file 1
224a6e2 feature file 1
fbdba34 inital file

MERGE SQUASH

- merge the selected branch into the current branch
- no automatic merge commit
- history of the merged feature branch is missing

git checkout master
git merge feature --squash
git log --oneline

0ffc6c8 (HEAD -> master) master file 1
fbdba34 inital file

REBASE

- rebase the feature branch onto the master branch
- no automatic rebase commit
- contains complete commit history, but the order is changed, commit history of feature branch is appended to master branch history

git checkout feature
git rebase master
git log --oneline

7ab5827 (HEAD -> feature) feature file 2
1c005d6 feature file 1
0ffc6c8 (master) master file 1
fbdba34 inital file

browsepulver
Автор

Merge: use it if I want to have the all logs in chronological order from the target branch and also have an extra "merge commit" in the tree at that merging moment
Merge --squash: use it if I just wanted to have the updates from the target branch but NOT their logs and also NOT wanting to have an extra commit at that moment, then later have a commit to represent my current work (not necessarily a merge commit)
Rebase: use it BEFORE PUSH if I want to have a clean git tree and I'm really sure that my commit messages look meaningful so that the target branch looks easy to read.
Am I right ?

RandomGuy-jvvd