Rebase a Local Branch to the Main Branch

To rebase a Local Branch from 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 will need to be activated first. See Activate a Branch.

The Rebase to main branch pop-up is opened and automatically closes if no errors occur:

Then, depending 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:
- Then 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

If a git error occurs during the Branch push, you can view the technical logs by clicking Show details.