Rebase a Local Branch to the Main Branch
To rebase a Local Branch to the Main Branch, access the Branch overview page of a Project:
Click on the Context menu for an activated Local Branch and choose the rebase to Main menu:
The Local Branch needs to be activated first. See Activate a Branch.
The rebase process will begin, and a pop-up window will open. The pop-up automatically closes if no errors occur during the operation:
The next steps depend on the files state of the Local and the Main Branch:
- If there are no conflicts between the Local and the Main Branch, the Rebase is executed and pushed to the Remote repository
- If there are conflicts between the Local and the Main Branch, the Rebase is executed, and a pop-up to resolve the conflicts is displayed:
- To resolve the conflicts, click the L button (choose the left side to merge) or the R button (choose the right side to merge) for each file.
- The conflicts are resolved:
- Once the conflicts are resolved, you can:
- Click on the UPDATE AND PUSH button: the conflict is resolved and pushed to the Remote repository
- Click on the REVERT button: the rebase is canceled, no changes are applied to the Local Branch
- Click on the UPDATE AND PUSH button: the conflict is resolved and pushed to the Remote repository
- To resolve the conflicts, click the L button (choose the left side to merge) or the R button (choose the right side to merge) for each file.
If you didn't achieve the conflict resolution and come back to the Branch overview, the Branch where conflicts must be resolved displayed a Resolve Merge Conflicts button instead of the Start Modeling button.
By clicking on it, you can finalize the conflict resolution.
If a Git error occurs while pushing the branch, click Show Details in the error pop-up to view the technical logs for troubleshooting.
Demonstration video