Automate Merge When CI Builds Pass

Overview

The Run Merge process on successful deployment feature keeps track of builds in source branches and merges them into a designated destination branch if they meet the configured criteria (for example, the build is successful). Rather than requiring manual effort, upstream merges can now be automated by the Salesforce Release Manager using revision numbers that were determined as part of a build cycle in CI jobs.

The feature is supported for the following CI jobs:

• Package and deploy SFDX source from version control

• Deploy from version control

Automate Merge Process Settings

Enabling auto-merge

You will find the On Successful Deployment > Run Merge Process checkbox under the Deploy section when you create a CI job in ARM and fill out all required details in the Build section (such as version control repository, branch, and revisions).

Configuring auto-merge

The following fields must be configured to start a merge when the build succeeds:

Users will be notified via email of the success or failure of the automated merge process.

Merge-built revisions only

A new checkbox called Merge built revisions only is newly added under the Deploy > On Successful Deployment > Run Merge Process section. On selection of the above-mentioned checkbox, ARM cherry-picks revisions identified as part of a build cycle to append them to the destination branch per the user's choice.