The ConflictResolutionConfiguration input includes various settings.

Table: ConflictResolutionConfiguration

ParameterTypeRequired[a]DefaultDescription
entityTypeAssetTypeyes The type of entity. The datatype, RepoOrViewName is a scalar.
entityNamestringyes The name of the entity. The type, VersionedPackageSpecifier is a scalar.
conflictResolutionMergeStrategyyes How conflicts are resolved. This is an enumerated list with two choices: Theirs, or Ours.

[a] Some arguments may be required, as indicated in this column. For some fields, this column indicates that a result will always be returned for it.