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).
Install
npx skills add forcedotcom/sf-skills --skill dx-devops-conflict-resolvenpx skills add forcedotcom/sf-skills --skill dx-devops-conflict-resolve -a claude-code -gnpx skills add forcedotcom/sf-skills --skill dx-devops-conflict-resolve -a codex -ggemini skills install https://github.com/forcedotcom/sf-skills.git --path skills/dx-devops-conflict-resolvegh skill install forcedotcom/sf-skills dx-devops-conflict-resolvegit clone --depth 1 https://github.com/forcedotcom/sf-skills /tmp/forcedotcom__sf-skills
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/forcedotcom__sf-skills/skills/dx-devops-conflict-resolve ~/.claude/skills/dx-devops-conflict-resolve # Claude Code
cp -R /tmp/forcedotcom__sf-skills/skills/dx-devops-conflict-resolve ~/.agents/skills/dx-devops-conflict-resolve # Codex, Cursor, Gemini CLI, Copilot, OpenCode