I watched this video after having some difficulty with a git rebase and the video photo perfectly captured my feelings after working with the rebase.

A channel with this level of production value has only 38 subscribers!? This video has the best explanation I’ve seen so far of rebase conflict resolution. Make me #39.

Thank you for this video! It's helpful to just see you go through the steps and pause to explain what we're looking at frequently, and why we're seeing the step we're at. This is a great approach and makes it much easier to learn than reading documentation in some cases.

Nice! Your explanations are very didatical! Thank you! I'm curious about the next video.

Nice, great explanation. And I liked that "I always pull before push to avoid conflicts", had a nice laugh

Looool. Everytime I have some conflicts to resolve I come for this video. Thanks a bunch.

probably only video that exactly addresses my problem. thank you.

It's criminal more people haven't seen this, especially the cut-away head smash. Hope you continue with more vids some day!

This is an excellent explanation. I had this issue at work some days ago and had to go through the painful road of figuring an alternative way to do it because I could not understand the videos I came across. But watching your video now, I see what I should have done clearly and clearly sees how it would have solved the conflicts I had.

The sketch really cracked me up. More, please!

Very well explained!

Thank you for this video!

I've been banging my head asking why do I keep getting the multiple conflicts during git rebase, I've looked everywhere, thinking I'm not doing it right. Now I know why, I should have done a squash first. Many thanks for that very last minute explanation, not even part if the video topic. It is why I came here. Many thanks

Great video, keep it up. This is really helpful to better understand git. It would also be nice to have something about branch strategy (trunk based vs gitflow or something). Or when to use a dev branch with separate feature branches. Or when to merge dev into master for a release

Thanks, this video was really helpful

Thank you, this helped me a lot.

Thank you so much, sir! For explaining this topic of rebasing with merge conflicts so well. I have watch many other videos. This is the clearest. I just used it to rebase and solve conflicts by myself for the 1st time! I thought I could never learn to do this by myself. It feels good to not have to plead my male colleagues for help with this all the time.

This is the best video!

The best one ever!

thank you so much! finally i undestand this

very helpful thank u :)

great stuff ..thanks

Thanks!

this was so useful! when is the interactive rebase vid coming?

I had a situation where I could not force push the changes after I fixed 5 commit conflicts which ended by one of the commit going missing as there was no difference. Maybe that's why force push didn't work. So I rebased pulled from my remote feature branch to my local branch and I had to fix things all over again and it was pretty different. After fixing conflicts now it has become crazy and full of other people's commits. I'm now thinking of creating a new branch from my current updated main branch then add my changes manually from my old feature branch since I don't want to deal with what's going on there it's messed up!

Thanks

Always so scary when you don't know exactly what you're doing. Thank you for clearing that up for me in the future!

U menya vse ravno stoit "first resolve merge conflicts", which I of course did, I am not a beginner. Did it serveral times without luck, still the same error. Never used rebase and had to

I was drinking some water while listenning at the video. At 0:47, I spat all of the water at my monitor because I laugh so hard.

Спасибо из Воронежа )

0:47 must have hurt

Thanks for the excellent video. At 4:05, you say "I can resolve this conflict in here, but this would create a merge commit, and a better way to do it is use a git rebase." ... Would appreciate some clarification on exactly _why_ is it better to use git rebase here versus using the UI and creating a "merge commit." Also, at 4:20, you used git fetch. Would git pull have done the job here, or does it have to be fetch? Why? Thanks for any additional insight!

At 4:20, how come you didn't have to pull the remote changes? I thought fetch only downloaded them without applying them?

ribs hurt from laughing so hard

Did team programmer become a HR associate or something? There is not a next video, maybe he fell in the lake in Salt Lake City? RIP team programmer

I did that but there is a loop

Isn't force push a bad strategy?

Thanks a lost.

I feel like he is struggling to not blink horizontally

This is not very helpful because it is a contrived example. I know the basics of how to resolve a merge conflict. I want to see practical examples of resolving merge conflicts. If for example you rebase one branch on top of your other branch, and you have merge conflicts, with duplicated work, how to solve it?