The Git integration with PyCharm supports the Rebase operation and provides interface that ensures high flexibility in setting rebase arguments.
The following functionality is supported:
- The basic use case, which involves applying a branch on top of the current HEAD of the master after synchronization with the upstream.
- Rebasing a branch entirely or partially to a specific commit in any branch or tag.
- Running rebase on several local repositories simultaneously.
- Selecting a merge strategy to apply, with the possibility to use no merging strategy at all.
- Running rebase interactively with control over preserving/squashing merges.
- Resuming interrupted rebase after merge conflicts are resolved.
- Cancelling rebase.
- On the main menu, choose Rebase Branches dialog box opens. . The
- From the Git Root drop-down list, select the relevant local repository.
-
From the Branch drop-down list, select the branch to rebase.
By default, the current branch is selected. If you specify another branch, it will be checked out.
- Specify the new base and commits to apply.
- On the main menu, choose
Before resuming rebase, view the log in the Version Control tool window.
.
If rebase has been initiated and interrupted on two or more local repositories, the Continue Rebasing dialog box is displayed. Use the Git Root drop-down list, to specify the repository to resume rebase on.
- On the main menu, choose
If rebase has been initiated on two or more local repositories, the Abort Rebasing dialog box is displayed. Use the Git Root drop-down list, to specify the repository to cancel rebase on.
.