dx-devops-conflict-resolve
Unblock DevOps Center branches before promotion.
What it does
Resolves Git conflicts in DevOps Center feature branches and diagnoses promotion deployment failures.
When to use it
Use for pre-promotion conflict checks, suspected merge conflicts, or diagnosing a failed promotion deployment.
How to use it
Give it a work item's repository and branch details; it produces a pushed, conflict-free feature branch or a deployment-failure diagnosis.
What you provide
- a feature branch or work item
- An existing project
What you need · 2
Hands off validation and promotion after conflict resolution, or full promotion after a qualifying diagnosis; installation is not stated as required to complete this skill's resolution or diagnosis.
Uses this skill when a work item must be resolved to its feature branch or candidate work items listed; an installation requirement is unstated.
Access · 1
This skill
connected Git repository
Pushes your resolved feature branch