Git MERGE vs REBASE: The Definitive Guide

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

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

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

BY FAR, the best channel on git

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

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

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.

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

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

Hey man, amazing video with great illustrative animations out there. There's just one thing which I found confusing. So in most of the scenarios that I have worked in, the git workflow looks something like this: 1) Create a feature_branch from main: `git checkout -b feature_branch`. 2) Makes changes to your feature branch: `git add -A && git commit -m "Your commit message"`. 3) During the development process some changes were pushed and merged to the REMOTE main branch. So you need to sync your LOCAL main with the REMOTE main: `git checkout main && git pull origin main` Once that's done... 4) You checkout your feature_branch and merge the updated local main with your feature_branch: `git checkout feature_branch && git merge main` 5) You push your local feature_branch to remote and create a pull request: `git push origin feature_branch` In this workflow we can probably replace the merge thing in step 4 with a rebase thing, if this feature branch is being worked on by a single contributor. What confuses me in the video is that at 5:40 : when we are on the feature branch we run `git rebase main` and then we checkout to main and run `git merge feature_branch`. Maybe that's done to illustrate fast forwarding merge here but in a production workflow isn't it discouraged to merge directly onto the main branch? Let me know if I missed a point or something.

Best git videos on youtube!!

Fantastic. I've subscribed !!

This video is fantastic. Thanks for sharing

Great video! You seriously deserve more recognition.

Great explanation. Well done!!

I quite like a semi linear approach. If I have a release/feature branch that multiple people are working on, rebase to keep in linear. Then when then when you want to merge to master, do a rebase and then merge with no fast forward. This way if you use gitversion, your main branch only has one commit per release but you have full history of commits for each release without a bird nest.

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, thanks for the effort.

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

First time i have seen such an attractive videos regarding git, captivating !!