Workshop rebasing and conflict resolution

Workshop allows you to rebase your branch when there are changes on the Main branch that are not available on your branch.

To rebase your branch from Main, navigate to the Changelog panel in Workshop. If the Main branch contains updates that do not exist on your branch, the following message will be displayed: Your module is out of date. There is a new version on the main branch. Rebase module to integrate new changes.

Merge checks within the branching taskbar also alert if a rebase is needed.

Select Rebase to integrate the new changes into your branch. To confirm, select the Rebase module option.

Conflicts when rebasing occur when changes from the main branch differ from changed tracked on your working base. To resolve these conflicts, select the conflicts to review the differences between what exists on your branch and main branch. Select the change you would like to persist on your branch and then select the Resolve button.