To clarify a common misconception: A "tree" in the context of Git does not refer to a commit history (because that is not in fact a tree in the mathematical sense due to merges, actually it's a DAG) but it refers to a snapshot of the repo, i.e. the content of a commit and therefore a filesystem tree. That might be important to know so not to get confused when reading the Git docs and learning about the Git working tree.

It's simple, never fucking rebase. The very concept of rebasing is fundamentally flawed and only used by damaged OCD people.

شكرا جزيلا .. thanks' a lot man

I think you may have an incorrect mental model of vim. The escape is not part of the quit command. The default mode in vim is the command mode. i puts you into insert mode and escape leaves insert mode and returns you to command mode. Colon moves you to another mode: ex mode where you can type ex commands. The ex command you're using in this situation is wq. If you're using escape before quitting even when in command mode, then it suggests you're not thinking of insert mode as something you dip in and out of before returning to the steady state of command mode and possibly missing out on the incredible power of command mode.

9:15

This is a clear explanation. Very good.

if we are using vi config.yml for vim ide , what command we will use for vs code ide?

Production quality is remarkable.

Fantastic explanation, resolved all my confusion about merging. Thanks

This isn't even close to being definitive... It skips over so many features that git provides for managing conflicts.

Great content! What are you using to make slides?

This is honestly the best git course in all KZfaq. Thank you so much!

So we merge after rebase? just rebase and push is bad practise? Please clarify. Thanks!

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

very cool , thank you !!!

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 .

My guy at the very beginning when you described git pull as being a combination of fetch and merge...it already instantly clicked for me xD thank you!

Nicely done, thanks my dude.

new subscriber. best explain very very very nice

Thank you a lot for this brother!

I always squash and never allow teammates to work on my branch. This way you maintain main branch clean with only feature commits and avoid conflicts with teammate locally. The only use case I had was when I was introducing a big feature >100 files and split my PR into 6, then I was rebasing branches in order of building block of the feature, where last branch was rebased into main feature branch after reviews of my peers.

Git mergetool is also useful

Best explanation

Please can u provide commads also

perfect

Truly appreciate! This is one of the best IT tutorial videos that I’ve ever seen!

"No nonsense, just get to the point" videos. Very easy to follow and much appreciated!!

1:00-1:05 "... my local main branch hasn't changed". Light bulb on.

Great video :)

If you push your feature branch to remote, but no one touches your branch, is rebase still safe?

thank you for a true lightbulb moment! It just makes sense now

You are the git goat with your visualizations.

I first seen your merge vs rebase a couple days ago and it really helped explain. KZfaq seemed to agree and recommended me this straight after uploading (im not subscribed), and again really helpful video. Gonna have to check out more!

You always have great videos. Keep it up!

Not first but second

perfect !!!

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 KZfaq 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 KZfaq about merge vs rebase. Thank you for sharing.😺

Great video, thanks for the effort.

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