Applying a Branch Entirely on Top of Master
Suppose you have branch1
based onmaster
. While you were working in branch1
, some updates were committed to master
.
The diagram below illustrates rebasing branch1
so that it applies on top of the current HEAD ofmaster
.
By default, commits 1
,2
, and 3
are applied one after another in the chronological order. To skip, edit, squash commits or change their order, run the rebase operation in the interactive mode.
To apply a branch entirely on top of the current HEAD of the master
- Initiate the rebase procedure.
- Clear the Preserve Merges check box.
- Clear the Interactive check box.
- From the Onto drop-down list, select the master branch.
- Clear the selection in the From drop-down list, if anything is selected.
- From the Merge Strategy drop-down list, selectDefault.
- Click the Rebase button. The rebase process starts. View the rebase log in the Version Control tool window, resolve conflicts that arise, and resume rebasing.
See Also
Last modified: 19 July 2017