External

Resolve external conflict

Resolves a named external sync conflict using the specified strategy. Strategies: local-wins, remote-wins, or manual (provide resolvedValue).

post/api/orgs/{org}/external/conflicts/{name}/resolve

Path parameters

orgstring required

Example:default

Organization slug

namestring required

Example:repo-conflict-abc123

Conflict resource name

strategy'local-wins' | 'remote-wins' | 'manual' required

Conflict resolution strategy

resolvedValueobject

Merged spec value (required for manual strategy)

resourcesobject

Additional resource context

Conflict resolved

resolvedboolean

conflictNamestring

strategystring

No recorded changes to this endpoint across all 1 revision of this API.