Skip to main content
Skip to content

CustomConnectorConflictResolution

No description

enum CustomConnectorConflictResolution {
  KEEP_MINE
  TAKE_UPSTREAM
}

Values​

CustomConnectorConflictResolution.KEEP_MINE​

For a path in fork.upstream_conflicts: keep the fork's version and record upstream as seen.

CustomConnectorConflictResolution.TAKE_UPSTREAM​

Revert to the base, for any path the fork changes, conflicted or not: an added file is deleted, a replaced or removed file gets the base content back, and manifest/<pointer> restores the base value of every manifest value the fork changes at or under that pointer.

Member Of​

CustomConnectorConflictResolutionInput input