Github updating a branch

Answered

WS2019.3EAP

If I create a new branch "B" based on "A" and then while working on "B" I want to refresh it from "A", with my changes in branch "B" still being on top of all the changes in branch "A" what are the commands I need to use in 2019.3EAP?

 

Tks

Rob

4 comments
Comment actions Permalink

> what are the commands I need to use in 2019.3EAP?

The same as in older versions. To keep your changes on top, you need to rebase the current branch (B) on (A).

From the branches popup, select the A branch and use Rebase Current Onto Selected action.

0
Comment actions Permalink

Searched for "Rebase Current Onto Selected action" and it doesn't exist 

There is a "rebase" menu item which opens a popup Rebase Branch - but if that's what you meant then I am confused how the various lookup boxes and checkboxes should be set to do this

GitRoot
Branch
interactive
Preserve Merges
Onto (filled with many refs/heads/**** and many refs/remotes/origin/**** entries, not sure which to pick)
From (?)
Show Tags

0
Comment actions Permalink

Rebase Current Onto Selected is not available in the FInd Action because it only makes sense in the context of a selected branch.

To select a branch, use Branches popup (Branches is available in Find action)

0
Comment actions Permalink

It would be easier to use the command line. `git rebase A` is perfect to get what you need.

-1

Please sign in to leave a comment.