Skip to content
Kitbay

dx-devops-conflict-resolve

Apache-2.0Updated on Nov 6, 20261,156GitHub starsIncludes scripts

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