Configure Merge Approval

You can enforce this workflow using merge approvals to ensure one or more people approve every merge. Merge approvals allow you to set the necessary approvals that will need to approve every merge in a project.

Use Cases

  • Enforcing review of all code that gets merged into a repository.

  • Specifying reviewers for a given proposed code change.

Configuring Approvals

To configure the merge approvals:

  1. Login to ARM with the admin credentials.

  2. Navigate to Admin > My Account and expand the Merge Settings

  3. Tick the Enable criteria-based Review Process checkbox.

  4. Select the Enable Merge Approver checkbox.

  5. Set the minimum number of required approvals under the Approval Level box. The minimum Approval Level can be 1.

  6. Click Save.

  7. 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 committed 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.

Eligible Approvers

  • No criteria can restrict the org admin from approving any merge.

  • The org admin can approve their merges even if the Disable Merge Self Approval checkbox is selected.

  • The EZ-Merge Approver (non-admin user) cannot approve their merges if the Disable Merge Self Approval checkbox is selected.

  • No more approval is needed if the approval level is set to 2 and the org admin approves the merge.

  • The L1 and L2 approver email ids cannot be the same when the approval level is set to 2.

More Information

The following details pertain to the criteria for commit validation approval:

  • There are no restrictions on the org admin's 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 cannot approve their commit unless they are an 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.

Last updated