This tutorial is so eloquent and much more explanatory than other youtube videos on rebasing. Thank you!

haha, man it is a bit scary when you stay with freezing smile on a face while screen is fading out :D great lessons. thank you

Thanks Marco ! Here each developper is working alone on its own feature branch (one task = one JIRA = one guy = one feature branch) So what you show is 100% useful to us and better than merging updated main develop branch onto a feature branch

If your remote is protected against push --force and push --force-with-lease you can do it as follows: git checkout feature-branch git rebase master git push origin --delete feature-branch git push origin feature-branch

Very clear and understandable explanation. Thank you a lot!!!

Pfff ... "use git" they say. It will be easier. :) As much as I would love to like git. Sometimes it's really a terribly complex monster. It's a minefield. I had the exact situation which you showed in your video today. I did a rebase, I wanted to push, and intellij told me there was another conflict. Surprised I clicked the "merge" button, and saw the strangest things. I agreed to accept the changes and then it told me I was running 100 commits ahead of the remote. I decided to throw my files away and to clone the repository over again. And I ran into the same thing. Until I found your video nothing seemed to explain what was happening here. Thank you very much for taking your time to create this video.

squash commit feature 2 and feature 3, you will only have to resolve conflicts once.

Very helpful video! Thank you for the explanation

Thank you!!! So very helpful! I was struggling with the rebase for few days.

Thanks!

Nice. This clarified my doubts 👌🏻

Thank you so much, you just showed me what I was looking for.

Git Push window has [Push] button with arrow down. That arrow popup [Force push] button. Easy. :)

Awesome tutorial about rebasing, i needed this. Thanks allot !

Thanks, nice description.

Wouldn't it make more sense for feature 2 & 3 to be on top of the reset commit and bugfix the last commit in the history? Feature 2 & 3 were created before bug fix and therefore "in time" older than the bugfix commit. Alternatively you could cherrypick bug fix on top of feature branch and then when ready rebase it all on top of the reset commit. Food for thought.

thank you for your great tips

this video was very helpful, thanks!

Best explanation! Thankyou!

Awesome ..this is what I was exactly looking for..

IMHO, this is often way too painful to be worth the nicer-looking log. Having to do one merge is annoying enough, but having to do 20? No thank you :D

Great explanation, thank you!

6:37 Actually, this is no longer true. For some time, force with lease is the default force push (at least in Intellij Community)

great help ... I was wondering if you could show how to squash commits using intellij git

Very helpful thanks !!

Thank you.

I don't get why avoid rebase when working with other developer? If I'm the only one work with feature A and other dev work with feature B , I still can rebase ?

Well done

on point!

What is the equivalent of this on the command line?

@Marco do you have a video on what editor this is?

Thanks man.

How to deal with big rebases? Sometimes I try `git pull --rebase` and I stuck with > 50 commmits to rebase. I do `git rebase --skip` for others commits, but I'm not sure if I'm doing right.

Thanks a lot

git push --force-with-lease

Which IDE u r using?

Hi Marco, as of today, is it still true that it's not possible to force push via intellij git when rebasing and instead having to run git push -f in the terminal?

dude, i like your vids, but I have always avoided rebasing. If, it is as complicated in your contrived example, then in the "real world" it would be bamboozling!!! I know its the correct way...but no way! I agree with Adam Hosman below.

what is your code editor u are using?

Which ide is this?

so he try to fix his kitten.

Thanks!