本文へスキップ
Kitbay
スキル公式

dx-devops-conflict-resolve

Apache-2.02026年11月6日 更新1,156GitHubスタースクリプトあり

A Salesforce skill for clearing what stops a DevOps Center work item from being promoted.

スキルの内容

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.

できること

  • 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