Rebase Feature Branch

Get your feature branch caught up with changes on the main branch.

The Problem

You make a feature branch, "BASED" on a starting commit on main. You do some work and commit: your VCS swimlane than tells you where you are in the history.

While you were working, you noticed your colleague committed to main. You don’t want to get out-of-date, so you do a fetch. The swimlane now shows that main has a commit after the one your branch is based on.

We’ll compare it with our working tree. Yes, you want that work in your branch. Start by getting those changes applied to your local main.

You could merge it into your branch. But then, when you finish and merge back to main, that commit will be in two places.

The Solution

Let’s see the solution visually, then perform the IDE action. Our feature branch was based off a starting commit. We want to "re-do: the basing. Meaning, re-base.

We want to act as if this branch started from a new commit, instead of the starting commit. We’re going to move the connection point. Go to that branch, and choose “Rebase [your branch name] onto main…”.

We select rebase and our VCS swimlane line now goes to the newer commit.

We just showed “look before you leap”: you fetch first, then rebase. Want to do both at once? This time, go to the remote branch and choose “Pull into …”. This does a fetch and rebase in one step.

Which way is better? Well, it depends. If you have a lot of trust, skip the step.

Related Resources

Clone from GitHub
Clone from GitHub
Create a project by cloning it from GitHub
Magic Wand
Magic Wand
Use the Magic Wand to Resolve Simple Conflicts
VCS Popup
VCS Popup
Open VCS actions using the keyboard