Suppose you have a branch branch1
based on master
. While you are working
in branch1
, some updates have been committed to master
.
The diagram below illustrates rebasing branch1
so that it applies on top of
the current HEAD of master
.
By default, the commits 1
, 2
, and 3
are applied one after another
in the chronological order. To skip, edit, squash commits or change their order, run rebase in the interactive mode.
- 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, select Default.
- 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.