If you want to make sure every merge is approved by one or more people, you can enforce this workflow by using merge approvals. Merge approvals allow you to set the number of necessary approvals that will need to approve every merge in a project.
- Enforcing review of all code that gets merged into a repository.
- Specifying reviewers for a given proposed code change.
To configure the merge approvals:
- Login to ARM with the admin credentials.
- Navigate to Admin > My Account and expand the Merge Settings
- Tick the Enable criteria based Review Process checkbox.
- Select the Enable Merge Approver checkbox.
- Set the minimum number of required approvals under the Approval Level box. Minimum Approval Level can be 1.
- Click Save.
- The steps above are the minimum required to get approvals working in your merge, but there are a couple more options available that might be suitable to your workflow:
- Auto commits on Approval: This option will allow developers to work on their feature branches and after review (approved), it gets automatically commit to the trunk.
- Disable Merge Self Approval: This option will allow you to prevent EZ-Merge approvers that have committed to a merge from approving it. However, the Org admins can still view the approve/reject option and proceed with all the merges.
- No criteria can restrict the org admin from approving any merge.
- Even if the Disable Merge Self Approval checkbox is selected, the org admin can approve their own merges.
- The EZ-Merge Approver (non-admin user) is not allowed to approve their own merges if the Disable Merge Self Approval checkbox is selected.
- If the approval level is set to 2, and the org admin approves the merge, no more approval is needed.
- The L1 and L2 approver email ids cannot be the same when the approval level is set to 2.
The following details pertain to the criteria for commit validation approval:
- There are no restrictions on the org admin ability to approve any prevalidation commits.
- If the Disable Commit Self Approval checkbox is enabled in Commit Validation - Approval Settings, the gated check-ins approvers will not be able to approve their own commit unless they are a org admin. The org admins can view the approve/reject option and proceed with the prevalidation commits.
- If the Enable Commit Approver checkbox is checked, the admin and the gated check-ins approver added to the reviewer list will be allowed to approve the prevalidation commits.
Was this article helpful?
Thank you for your feedback! Our team will get back to you
How can we improve this article?
Character limit : 500