Merge Requests

Merge after all reviews are resolved.

After this parameter is selected, if Must resolve is selected as the review comment, a message Review comment gate: failed is displayed and the Merge button is unavailable. If it is a common review comment, the Resolved button does not exist, the MR is not intercepted by the merge condition.

Must be associated with CodeArts Req

• Associate only one ticket number: If this parameter is selected, one MR can be associated with only one ticket number.
• All E2E ticket numbers pass verification: If this parameter is selected, all associated E2E ticket numbers must pass the verification.
• Branches to configure the MR policy: Multiple branches can be added. You can manually enter wildcard characters and press. Press Enter, for example, *-stable or production/*.

Do not merge your own requests

After this parameter is selected, the Merge button is unavailable when you view the MRs created by yourself. You need to ask the person who has the permission to merge the MRs.

A repo administrator can forcibly merge code

The project creator and administrator roles have the permission to forcibly merge MRs. If the merging conditions are not met, these roles can click Force Merge to merge MRs.

Continue with code review and comment after requests are merged

After this parameter is selected, you can continue to review and comment on the code that has been merged the MR.

Mark the automatically merged MRs as Closed (If all commits in the B MR are included in the A MR, the B MR is automatically merged after the A MR is merged. By default, the B MR is marked as merged. You can use this parameter to mark the B MR as closed.)

• If this parameter is not selected, MRs that are automatically merged are marked as merged.
• If this parameter is selected, MRs that are automatically merged are marked as closed.

Cannot re-open a Closed MR.

If this option is selected, the branch merge request cannot be set back to Open after it is closed. Re-open in the upper right corner is hidden.

This parameter is used for process control to prevent review history from being tampered with.

Delete source branch by default after the MR is merged

After the merging, the source branch is deleted.

• A protected source branch cannot be deleted.
• This setting does not take effect for historical MRs. Therefore, you do not need to worry about branch loss.

Do not Squash

After this parameter is selected, the Squash button is unavailable, and the entry for using this button is unavailable in the MR.

Enable Squash merge for new MRs

Squash merge means that when merging two branches, Git squashes all changes on the merged branch into one and appends them to the end of the current branch as merge commit, which simplifies the branch. The only difference between squash merge and common merge lies in the commitment history. For common merge, the merge commitment on the current branch usually has two commitment records, while squash merge has only one commitment record.

Merge commit

If this parameter is selected, a merge commit is created for every merge, and merging is allowed as long as there are no conflicts. That is, no matter whether the baseline node is the latest node, the baseline node can be merged if there is no conflict.

• Do not generate Merge nodes during Squash merge: If this parameter is selected, no merge node is generated during the squash merging.
• Use MR merger to generate Merge Commit: If this parameter is selected, the commit information is recorded.
• Use MR creator to generate Merge Commit: If this parameter is selected, the commit information is recorded.

Merge commit with semi-linear history

If this parameter is selected, a merge commit is recorded for each merge operation. However, different from Merge commit, the commitment must be performed based on the latest commit node of the target branch. Otherwise, the system prompts the developer to perform the rebase operation. In this merging mode, if the MR can be correctly constructed, the target branch can be correctly constructed after the merge is complete.

Fast-forward

If this parameter is selected, no merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. When fast-forward merge is not possible, the user is given the option to rebase.

Branches

Set policies for all branches or a branch.

Reviewers Required

Set Reviewers Required. When the number of reviewer who give pass meets the Reviewers Required, the gate is passed. 0 indicates that the review gate is optional. However, if an MR is rejected by a reviewer, it fails the gate.

Approvals Required

Set Approvals Required. When the number of approvals who give pass meets the Approvals Required, the gate is passed. 0 indicates that the approval gate is optional. However, if an MR is rejected by an approver, it fails the gate.

Reset approval gate

When code is re-pushed to the source branch of an MR

Reset review gate

When code is re-pushed to the source branch of an MR

Add approvers/reviewers only from the following ones

If this option is selected, you can configure the list of New Approvers and New Reviewers. If you want to add additional members, you can only add members from the lists.

Enable pipeline gate

If this option is selected, before the merge, you need to pass all pipeline gates. This rule integrates the CI into the code development process.

Mergers

The list of mandatory mergers can be configured. When a merger request is created, the list is automatically synchronized to the merger request.

Approvers

The list of mandatory reviewers can be configured. When a merge request is created, the list is automatically synchronized to the merge request.

Reviewer

The list of mandatory reviewers can be configured. When a merge request is created, the list is automatically synchronized to the merge request.