Software Development
Dx DevOps Conflict Resolve
Use this skill to diagnose and resolve what blocks a DevOps Center promotion of a work item's feature branch: Git merge conflicts and deployment failures. DevOps Center is Git-backed, so overlapping metadata changes surface as merge conflicts against the target stage branch, resolved with git (detect, resolve markers, commit, push). Deploy failures often cite a missing dependency a full promotion can fix when the component already exists on the branch. TRIGGER when the user wants to check a work item for conflicts before promoting, resolve merge conflicts or leftover conflict markers in metadata files (.xml, .object-meta.xml, .cls), reconcile a feature branch with its target stage branch, or diagnose why a DevOps Center promotion or deployment failed and whether a full promotion or a missing-dependency fix will resolve it. DO NOT TRIGGER for running the promotion itself (use dx-devops-promote), creating or updating work items (use dx-devops-work-item-manage), or deploying metadata directly to an org.
- Publisher / source
- forcedotcom/sf-skills (found on skills.sh)
- Upstream record
- forcedotcom/sf-skills
- Version
- Version 3
- Published
- Publication review
- Approved for publication
- Content fingerprint
b1dde42c950f5d3d1e2d5afb93c906cfd931848ca6fd0384c2b1866f62ad6dbc