Helix TeamHub only supports Multi-repo code reviews for Helix Git repositories.
For multi-repo code reviews, you can access merge options by clicking the cogwheel icon next to the primary merge action.
Helix TeamHub supports the following methods for merging a multi-repo code review:
Merge commit: Helix TeamHub retains the full history of changes without fast-forwarding. This means that the
--no-ffflag is applied when merging. This is the default method.
Merge and delete head branches: Helix TeamHub retains the full history of changes without fast-forwarding. This means that the
--no-ffflag is applied when merging.Important
TeamHub respects the merge settings for individual code reviews before allowing the merge of the multi-repo review but it does not respect the delete settings. TeamHub will delete all head branches no matter what the individual code review repository settings are. Branches that are protected or still in use in other reviews are not deleted.
- Rebase and merge, and Squash and merge are not supported by Helix TeamHub for multi-repo code reviews.
- If a conflict occurs when you merge a multi-repo code review, the merge fails. In this case, you need to manually resolve the conflict from the command line.