Git MERGE vs REBASE: The Definitive Guide

MORE GIT VIDEOS: youtube.com/playlist?list=PLfU9XN7w4tFwKwh_xPSQ_X1…

in my almost 15 year of using Git, this is by far the best video on how to use merge and rebase. thank you!

Production quality is remarkable.

Great video. I've been using Git forever, and this is probably the best explanation I've ever seen of merge, rebase and fast-forward.

Best explanation I have ever seen on YouTube about merge vs rebase. Thank you for sharing.😺

Probably the best videos about git, out there. The animations are a huge help. Thank you so much!

BY FAR, the best channel on git

Thanks a lot! At last after several years using Git, I (think) I finally grasped it.

Amazing tutorial !! really appreciate posting this tutorial explaining "git merge" and "git rebase"

Your videos are the most clear I ever seen on this topic and still contains enough details

Crystal clear ! I'm glad I've found your channel and eager to discover more

I'd like to think of both as merging, but done differently. Here's how: "Git merge" from a current branch into the target branch is when Git takes the latest changes of the current branch, then take the latest changes of the target branch and combine them. The new combination is made into a new commit and placed as the latest commit of the target branch. Git will still keep around the history of all the commits that had been made up until the merge of either branch. "Git Rebase" from current branch into target branch is when Git first takes all the commits from the current branch, lines them up in the order they were made and puts them aside for now. Then Git takes the oldest commit from current branch and "merges" it with the latest commit on the target branch by doing it like a regular merge: combing the changes, make a new commit that represents those combined changes then places that new commit as the latest commit on the target branch. Then Git moves on the second oldest commit on the current branch and repeats the process. All the way until the latest commit of the current branch is merged. But remember, the current branch is still set aside, what will Git do with those commits that have effectively become duplicates? Git will just delete those commits, hence why history has been rewritten. Hope this helps

Best git videos on youtube!!

Excellent explanation and a nice, clean video. Well done. Subbed

As a single dev , I only ever use rebase amd NEVER merge just to keep the history strictly linear , however this is a luxury that larger teams might not have . The tip about only using rebase for your own local work is 100% the right way to use it , imo .

This is the best git videos on youtube. This is amazing work. I am begging to you please move whole git with kind of videos

Great video! You seriously deserve more recognition.

Fantastic. I've subscribed !!

Great explanation. Well done!!

Excellent video, I've always been worried about using rebase, this helps massively