forcedotcom / forcedotcom/devops-center-feedback
DevOps Center – How to promote a single Work Item to Prod when UAT has pending Work Items and merge conflicts
- Dominant language
- No language data
- Stars
- 61
- Forks
- 2
- PR merge metrics
- No merged PRs in 30d
Description
We are using Salesforce DevOps Center and running into an issue with Work Item promotion when multiple items are sitting in UAT stage.
**Scenario:**
There are several Work Items already promoted to UAT but not yet promoted to Prod.
I created a new Work Item and attempted to promote it from Development → UAT.
The promotion failed due to merge conflicts because of the existing UAT Work Items.
To resolve the conflicts, we merged the UAT branch back into the feature branch of this new Work Item.
This resolved the conflicts, but it also pulled all other UAT changes into the feature branch.
**Problem:**
Now, when we try to promote only this specific Work Item to Prod (without promoting the other UAT Work Items), the promotion fails because the feature branch already contains those additional UAT changes.
Question:
What is the recommended or best-practice approach in DevOps Center for handling this situation?
How can we promote a single Work Item to Prod when UAT already has other pending Work Items?
Is there a way to resolve UAT merge conflicts without merging the entire UAT branch into the feature branch?
Or does DevOps Center require that all UAT Work Items be promoted together once they are merged?
Any guidance, best practices, or real-world DevOps Center workflows would be greatly appreciated.
Contributor guide
Assessment
This issue has not been assessed yet.