Skip to main content

resolveCustomConnectorForkConflicts

Settles upstream conflicts and reverts fork changes to the base on the fork's draft at expectedRevision, all in one write (see CustomConnectorConflictResolution), and returns the draft at its next revision. A path the fork does not change is a validation error, and so is KEEP_MINE on a CONTAINER_REMOVED conflict. Fails with CUSTOM_CONNECTOR_REVISION_CONFLICT when the draft moved. expectedBaseDigest (fork.base.digest as read) is required with any KEEP_MINE, which accepts the base as it is: a base that moved since fails with CUSTOM_CONNECTOR_BASE_CHANGED.

resolveCustomConnectorForkConflicts(
connectorId: ID!
expectedBaseDigest: String
expectedRevision: Int!
resolutions: [CustomConnectorConflictResolutionInput!]!
): CustomConnectorVersion!

Arguments​

resolveCustomConnectorForkConflicts.connectorId ● ID! non-null scalar​

resolveCustomConnectorForkConflicts.expectedBaseDigest ● String scalar​

resolveCustomConnectorForkConflicts.expectedRevision ● Int! non-null scalar​

resolveCustomConnectorForkConflicts.resolutions ● [CustomConnectorConflictResolutionInput!]! non-null input​

Type​

CustomConnectorVersion object​