Git Rebase in any JetBrains IDE

When you rebase a branch onto another branch, you apply the commits from the first branch on top of the head commit in the second branch.

Suppose you have created a feature branch to work on a specific task and make several commits to that branch. While you develop in your branch, your teammates continue to commit their work to the main branch. When you perform the rebase operation, you integrate changes you have done in your feature branch to the main branch by applying your commits on top of the current HEAD commit in the master branch.

#JetBrains #Rebase #Tips #PhpStorm #WebStorm #Clion #DataGrip #DataSpell #GoLand #IntelliJ #PyCharm #Rider #RubyMine

[mnreal]

He looks like the kind of teacher that would give you a lollipop after you answer a question correctly

[darrenjacquet]

I don't normally comment on videos but I have to say that I really love the Git features Paul has highlighted and really hope you keep them coming. Thank you, thank you, thank you.

[gauravmay]

This is the best explanation that I have seen on Rebasing. Thank you Paul.

[ssushovan]

Thanks to the JetBrains team for putting this concept in such a simplified & beautiful way! I loved your humour though. :D

[carinaschoppe]

I realy love the new profile view shots. Gives the video a touch of personality and friendlyness

[juliensere]

Just discoverd your channel throught this video, what an amazing work to explain rebasing ! Love the animation & all the highlightning needeed ! amazing work !

[SosetaFurioasaJr]

PAUL IS FUN! PAUL IS FUN! I WANT MORE PAUL EXPLAINING THINGS! 😊

[Mohammad]

I enjoy watching theses videos and I'm learning too much from them, thanks for the effort.

[shrikantbiradar]

Are you for real..I was struggling for so many days to know this properly...just a 4 min video helped me to do it.. Thanks a lot...

[TikoyTV]

Awesome video as always! Thank you JetBrains. You rock!

[slimyelow]

Now that i finally get it, i'll take the afternoon off and celebrate with some freebasing at home.

[italoandre]

What a great explanation! (plus his eyebrow moves are on point)

[shubhamjumde]

At 1:40, Rebase local-work branch on main branch, is this local main branch updated from remote main branch?
Rebasing the feature branch is done in local working repository. So, in my opinion, the local main or master branch should be first updated with remote one and then we can do rebasing the local feature branch with local main/master branch.

[hundvd_]

I really wouldn't say "pull into" from remote needs any more trust.
What it depends on is whether or not you have a local branch of "main" that you want to keep up to date.

For me, I just never, ever have a "main", or "develop" or "master" locally.
I immediately check out the remote main into feature branches, and I always rebase from the remote, too.

[McQuinTrix]

Is it possible to do rebase when "local-work" is pushed to remote?

[alzy]

After doing this, my IDE complains when I want to push asking me to either merge or rebase. Hitting merge seems to create a new commit which I don't want, hitting rebase resets everything. Ultimately ended up manually running git push --force to get the end result I wanted. Not sure what I'm missing

[ReikiWind]

OK but how to do it in Jetbrains fleet?

[KevinPfeifer]

So no mention of having to use "git push -f" because we are now re-writing history?

[aliday]

When you have a hour to resolve dozen conflicts

[sapientum]

A well-made, clear explanation.



But I still don't get it.