Git rebase: how to resolve conflicts

Conflicts resolution process during git rebase is somewhat confusing to a lot of developers I've worked with. In this video I try to explain it as simply as possible and then show the simple way to do it.

Contents:

0:00 Short sketch - thank you Bryan and Danny!
0:26 Git rebase recap, short explanation
1:36 Demo of git rebase with conflicts

Next up: squashing commits with git rebase.

Follow me online:

[jasonfreeman]

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.

[TokyoXtreme]

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.

[ShadyRonin]

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.

[AC-ezky]

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

[alefrwx]

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

[AltruisticHedonism]

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

[dxphilo]

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

[mohammadsalman]

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

[imuentinyannosarumen]

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.

[dariatss]

The sketch really cracked me up. More, please!

[larryoke]

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

[huayang]

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.

[jvanelteren]

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

[andressalazar]

Thanks, this video was really helpful

[alejandroperezrivas]

thank you so much! finally i undestand this

[thierrybeaulieu]

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.

[saschametz]

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

[meer-uqns]

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!

[thekillercrab]

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

[SirBenJamin_]

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