dx-devops-conflict-resolve
A Salesforce skill for clearing what stops a DevOps Center work item from being promoted.
What the skill teaches
A Salesforce skill for clearing what stops a DevOps Center work item from being promoted. Because DevOps Center is backed by Git, the agent checks the work item's feature branch against the target stage branch for merge conflicts, resolves conflict markers in metadata files, commits and pushes. When a promotion or deployment fails, it reads the failure and works out whether a missing dependency is the cause and whether a full promotion would fix it. Bundled shell scripts detect conflicts and diagnose deploy failures; running the promotion itself is left to another skill.
Capabilities
- Detect merge conflicts for a DevOps Center work item
- Resolve conflict markers in metadata files
- Diagnose failed DevOps Center deployments
- Commit and push the reconciled feature branch
About
- Publisher
- Salesforce
- Tool
- Salesforce
Install
- Run this to add it to Any client:
npx skills add forcedotcom/sf-skills
What's inside
- examples/conflict-workflows.md
- references/deploy-failure-resolution.md
- references/git-conflict-resolution.md
- scripts/detect-conflicts.sh
- scripts/diagnose-deploy-failure.sh
MCP servers and skills can run code on your computer and act on your data. Review the source before installing.
This skill includes scripts that your agent may run.
Details
| Fact | Value | Source |
|---|---|---|
| Type | Skill | |
| Tool | Salesforce | |
| Publisher | Salesforce | source |
| Official status | OfficialSalesforce's developer documentation for its skills and plugins links to the forcedotcom/sf-skills repository | source |
| Needs an API key or sign-in | Not stated in its documentation | |
| Includes scripts | Yes | source |
| Platforms | Not stated in its documentation | |
| AI clients | Not stated in its documentation | |
| Licence | Apache-2.0 | source |
| Pricing | Not stated in its documentation | |
| Activity | Last commit Nov 6, 20261,156 GitHub starsDownload data not available (not on npm or PyPI) | source |
| Links | Repository |
Sources
- Skill file (SKILL.md)github.com/forcedotcom/sf-skillsNov 13, 2026
- README (README.md)github.com/forcedotcom/sf-skillsNov 13, 2026
- Licence file (LICENSE.txt)github.com/forcedotcom/sf-skills · Backs: Licence, PublisherNov 13, 2026
- Web pagedeveloper.salesforce.com · Backs: Official statusNov 13, 2026
- Folder in the repository (dx-devops-conflict-resolve)github.com/forcedotcom/sf-skills · Backs: Includes scriptsNov 13, 2026
- GitHub repositorygithub.com/forcedotcom/sf-skills · Backs: Activity, LicenceNov 11, 2026
- Skill file (SKILL.md)github.com/forcedotcom/sf-skillsNov 10, 2026
- Folder in the repository (dx-devops-conflict-resolve)github.com/forcedotcom/sf-skills · Backs: Includes scriptsNov 10, 2026