Merge Conflicts in metadata-rules-x.json file — Cloud Customer Connect
You're almost there! Please answer a few more questions for access to the Applications content. Complete registration
Interested in joining? Complete your registration by providing Areas of Interest here. Register

Merge Conflicts in metadata-rules-x.json file

edited Sep 3, 2025 8:24AM in Visual Builder Studio for HCM

Summary:

We created a branch (branch A) off main branch in dev instance. Completed a customization wherein we enabled grade step field in hire an employee flow. Published this branch, merged to main and deployed via the build jobs. Then we created a release branch and merged branch A to release branch (cherrypicked). Then created package and deploy jobs to migrate the changes in release branch to test instance. The changes were successfully moved to test.

We created another branch (branch B) again off main branch in dev instance, this time to enable peoplegroup field in hire an employee flow. Published this branch, merged to main and deployed via the build jobs. Now we want to move this change to test. I am cherrypicking this branch to merge it to the same release branch that we had created earlier. I am getting merge conflicts in metadata-rules-x.json file, while the only change is in the metadata-rules file that we want to merge.

Tagged:

Howdy, Stranger!

Log In

To view full details, sign in.

Register

Don't have an account? Click here to get started!