not useful

Syncing repos was a nightmare for me. Not anymore! Thanks A lot!!!

thank you so much. this has been the clearest explanation I`ve encountered. I have a test soon about this topic, and also need it currently for another school project :)) but solving the conflict on the terminal always seemed so intimidating

I had faced an issue while uptaking merge branch additional commits into feature branch using git merge in gitlab UI where merge conflict was arising. When I resolved then conflict on gitlab UI itself and merge request was granted, both the main and feature branches got merged into each other and main branch had the commits of feature branch😠. Any reason for this weird behaviour?

This was awesome! Online can make rebase look so terrifying

I read the official pro git textbook, but did not understand what i should have done with the conflict. Then i searched for git merge conflict and found your KZbin channel. Thank you for this video. The only recommendation is to speak a little bit slower, to give us time to digest the information. Other than that I really loved the combination of an animated graph, which underpins the theory, and a practical conflict resolution using a manual process, or VScode. Again thank you. By the way i will checkout the website and purchase the git course.

Thank you, amazing! I was always "afraid" of using cherry picking, but with this excellent explanation I will use it often.

Great video. Would love to see how this plays with pull requests

This is insane ❤

Amazing video.. Was struggling a bit with conflicts and the log and decided to dedicate an hour for a couple videos to once and for all kill all the missing pieces in my mental model even though I use git for years... One thing that wasn't 100% clear is at the end of the video the "recommended workflow" tells you to rebase your branch and then merge it when ready, but that doesn't apply if the branch is on remote and has more people working on it correct? That would mean that remote branches should never get the latest changes from their parent branch unless absolutely necessary, and in that case you'd need to merge from the parent branch.

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

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

Great video, thanks for the effort.

Amazing explanation. Those animations made it very easy to understand.

Not bad . Does it change if you cannot push to master but instead have to do a pull request? We have branch protection enabled at work , so changes require PR’s that have to pass automated tests and also get at least 2 approvals.

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.

Excellent Explanation... Thank You

can i pop the stash on another branch?

Awesome video man.

Not sure if I am doing it right. I have 2 branches, dev and main. Let's say dev and main are in sync initially. At at present, my development work in going on and I have added 3 new commits to dev (main now lags by 3 commits). At this point of time there is a production issue and I add a fix on dev and make the 4th commit. After switching to main branch, if I run `git cherry-pick bd46315 <4th-commit-hash>`, it's pulling earlier 3 commits along with 4th one. I want to pull only the 4th commit: bd46315 (origin/dev, dev) 4.HOT FIX ADDED ede1f33 3.textarea added 88cdb80 2. select dd added c93667f 1. text input added 62d132f (HEAD -> main, origin/main) Initial commit

Your teaching approach is refreshingly efficient and straightforward, guiding learners directly towards their goals. The use of animation enhances comprehension and fosters a deeper understanding of all the concepts related to Git. many thanks

First time when someone could really explain something in sub 10 minutes.

This video is fantastic. Thanks for sharing

After I did rebase, the order of commits changed...

Absolutely Awesome Big man! thanks

how is git fetch different from git pull ?

Really Good Video

very nice, sir, thanks!!!

1:04: "And that maximises the pain" - I feel it bro.

Excellent work, thank for helping me understand several Git concepts

Nice but too abstract 😢

I'm a bit confused. In the first example, you did this: 1. touch config.json 2. git add . 3 git commit -m "Added configuration file skeleton" 4. git fetch origin 5. git push origin main git fetch origin - "reaches out to remote repository and pulls down any new commits that you might not have yet" . However in the second example(coffee break) you did this : 1. git fetch origin # automatically downloads the changes 2. git status # your branch is 1 commit behind 3. git merge origin/main # to incorporate those changes into your local branch - to merge your local main with origin main. 4. git status # Voilà ! I don't fully understand why did you do "git merge origin/main" in the 2nd example. In the first example just "git fetch origin" was enough to download any changes and then do a push.

Great tutorial. Thanks My question: Context: one of the weekends, I made tons of progress for the codebase, I changed 10 files. Let's say I am only allowed to make a PR that includes changes from 2 files. I don't want to make PRs during the weekends, and I am going to make 5 prs on Monday, and they all depend on each other, meaning I need to divide all my progress into at least 5 PRs. Question: What is your git stratagy to handle this situation?

Hi. Have fun!

Disagree… I use WSL extensively

Great video. Thanks. What software fif you use to animate?

Thanks for the tutorial. A question: I ran into a problem of headless state after I checked out a specific commit inside the branch to make a pr on top of the specific commit. My manager told me don't checkout commit, alway checkout branch. I just don't understand this, what's the thing with headless state, and why it's a bad practice to checkout a commit?

Hi bro i have one issue while cherry pick what is happening na example my bug fix is in fix1 branch which dev branch and i need to movie that in production branch so when i moved this thing in that prod branch it error while im compiling because of in prod old code is there and dev every person doing new changes are there my cherry pick changes are moved to some other lines so help me to resolve this bro

I spent the lat 24 hrs trying to figure out how the whole process of rebase was and how it works. Now with your video makes total clear

Excellent. Very few can deliver technical information with this sort of precision. Please, please, please keep these coming.

Git of the building blocks???

I gotta say, till this day you have some of the most if not the most appealing, understandable and engaging videos about learning git in all YT. I really need to support you, where I have the chance I'm gonna buy the course. P.D: I don't know about marketing but I feel that with the proper approach, your course will definitely "sell out".

What happen when nav is merged into main after a cherry pick. Will the old hashes for cherry pick commits be merged still?

At the end when you demo'd multiple commits being cherry picked, the more recent commit was listed first. If the recent commit built on top of the earlier commit, would it make sense to order them by earlier commit first and recent commit second when doing git cherry pick? I.e. git cherry-pick <earlier-commit> <recent-commit>

what happens to the feature branch when you rebase it on master?

too good

I’m really thankful for you having produced this material on git rebase. Thank you. Also, I really appreciate the write-up as well. Great contribution. Subscribed.

As of now, I have seen a few videos about rebase but it is very compact. Thanks