Resolve DevOps Center Merge Conflict
sf_resolve_devops_merge_conflictResolve a DevOps Center merge conflict by marking it as resolved with a chosen strategy—ours, theirs, or manual—after manually fixing conflicts in source control.
Instructions
Marks a merge conflict in DevOps Center as resolved with a specified resolution strategy. Use after manually resolving conflicts in the source control system.
conflictId: merge conflict record ID resolution: resolution strategy — 'ours' (keep our changes), 'theirs' (accept incoming), or 'manual' (already resolved)
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| conflictId | Yes | Merge conflict record ID | |
| resolution | Yes | Resolution strategy |