Dx Devops Conflict Resolve
forcedotcom/sf-skills/plugins/builder/dx-devops/skills/dx-devops-conflict-resolveby forcedotcome5164d94d7511c00fa02a5b8b60754b2361e178fNo license1K starsListed Oct 9, 2026Updated Oct 9, 2026Repository updated 2 days ago
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.
Only the file list is public. File contents are available once the skill is installed in a workspace.
| Path | Size | Type |
|---|---|---|
| examples/conflict-workflows.md | 7.2 KB | text/markdown |
| references/deploy-failure-resolution.md | 5 KB | text/markdown |
| references/git-conflict-resolution.md | 6.4 KB | text/markdown |
| scripts/detect-conflicts.sh | 3.5 KB | text/plain |
| scripts/diagnose-deploy-failure.sh | 7.1 KB | text/plain |
| SKILL.md | 16.5 KB | text/markdown |
Source and attribution
Source:forcedotcom/sf-skillsinplugins/builder/dx-devops/skills/dx-devops-conflict-resolveat commite5164d9
License: No license
Content belongs to its original authors. SourceWeft indexes it from a public repository.
More from forcedotcom/sf-skills
Platform Widget Generate
forcedotcom
Authors a complete HXL WidgetBundle: UEM widget tree, schema.json, and .uiwidget-meta.xml registration file.
Platform Report Generate
forcedotcom
Generates and validates Salesforce Lightning Report metadata files (.report-meta.xml) for deployment.
Platform Value Set Generate
forcedotcom
Generates and validates Salesforce GlobalValueSet and StandardValueSet metadata XML for reusable picklists.
Platform Sharing Rules Generate
forcedotcom
Generates, edits, retrieves and deletes Salesforce Sharing Rules metadata for record-level access.
Platform Validation Rule Generate
forcedotcom
Guides creation, modification and validation of Salesforce Validation Rules and their metadata formulas.
Platform Sharing Owd Configure
forcedotcom
Retrieves and updates Salesforce Organization-Wide Default sharing settings for standard and custom objects.
More in DevOps & Cloud
Playwright Devops
microsoft
DevOps workflows for Playwright: analyze GitHub Actions failures for the last commit on main and fetch failed job logs.
M5 Onboard
anthropics
Provisions M5Stack ESP32 boards by detecting them on USB, flashing UIFlow 2.0 firmware, and installing a MicroPython app bundle.
Yeet
openai
Stages, commits, pushes, and opens or updates a GitHub pull request in one flow using the GitHub CLI.
Runbook
anthropics
Creates or updates step-by-step operational runbooks for recurring tasks, including troubleshooting, rollback and escalation.
Incident Response
anthropics
Guides an incident response workflow: severity triage, status updates, mitigation tracking, and blameless postmortems.
Deploy Checklist
anthropics
Generates a pre-deployment readiness checklist covering pre-deploy, deploy, post-deploy and rollback triggers.