Module Values.BatchDescribeMergeConflictsOutputSource

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.

Sourcetype nonrec t = {
  1. conflicts : Conflicts.t option;
    (*

    A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

    *)
  2. nextToken : NextToken.t option;
    (*

    An enumeration token that can be used in a request to return the next batch of the results.

    *)
  3. errors : BatchDescribeMergeConflictsErrors.t option;
    (*

    A list of any errors returned while describing the merge conflicts for each file.

    *)
  4. destinationCommitId : ObjectId.t option;
    (*

    The commit ID of the destination commit specifier that was used in the merge evaluation.

    *)
  5. sourceCommitId : ObjectId.t option;
    (*

    The commit ID of the source commit specifier that was used in the merge evaluation.

    *)
  6. baseCommitId : ObjectId.t option;
    (*

    The commit ID of the merge base.

    *)
}
Sourcetype nonrec error = [
  1. | `CommitDoesNotExistException of CommitDoesNotExistException.t
  2. | `CommitRequiredException of CommitRequiredException.t
  3. | `EncryptionIntegrityChecksFailedException of EncryptionIntegrityChecksFailedException.t
  4. | `EncryptionKeyAccessDeniedException of EncryptionKeyAccessDeniedException.t
  5. | `EncryptionKeyDisabledException of EncryptionKeyDisabledException.t
  6. | `EncryptionKeyNotFoundException of EncryptionKeyNotFoundException.t
  7. | `EncryptionKeyUnavailableException of EncryptionKeyUnavailableException.t
  8. | `InvalidCommitException of InvalidCommitException.t
  9. | `InvalidConflictDetailLevelException of InvalidConflictDetailLevelException.t
  10. | `InvalidConflictResolutionStrategyException of InvalidConflictResolutionStrategyException.t
  11. | `InvalidContinuationTokenException of InvalidContinuationTokenException.t
  12. | `InvalidMaxConflictFilesException of InvalidMaxConflictFilesException.t
  13. | `InvalidMaxMergeHunksException of InvalidMaxMergeHunksException.t
  14. | `InvalidMergeOptionException of InvalidMergeOptionException.t
  15. | `InvalidRepositoryNameException of InvalidRepositoryNameException.t
  16. | `MaximumFileContentToLoadExceededException of MaximumFileContentToLoadExceededException.t
  17. | `MaximumItemsToCompareExceededException of MaximumItemsToCompareExceededException.t
  18. | `MergeOptionRequiredException of MergeOptionRequiredException.t
  19. | `RepositoryDoesNotExistException of RepositoryDoesNotExistException.t
  20. | `RepositoryNameRequiredException of RepositoryNameRequiredException.t
  21. | `TipsDivergenceExceededException of TipsDivergenceExceededException.t
  22. | `Unknown_operation_error of string * string option
]
Sourceval make : ?conflicts:??? -> ?nextToken:??? -> ?errors:??? -> ?destinationCommitId:??? -> ?sourceCommitId:??? -> ?baseCommitId:??? -> unit -> t
Sourceval error_of_json : string -> Yojson.Safe.t -> [> `CommitDoesNotExistException of unit | `CommitRequiredException of unit | `EncryptionIntegrityChecksFailedException of unit | `EncryptionKeyAccessDeniedException of unit | `EncryptionKeyDisabledException of unit | `EncryptionKeyNotFoundException of unit | `EncryptionKeyUnavailableException of unit | `InvalidCommitException of unit | `InvalidConflictDetailLevelException of unit | `InvalidConflictResolutionStrategyException of unit | `InvalidContinuationTokenException of unit | `InvalidMaxConflictFilesException of unit | `InvalidMaxMergeHunksException of unit | `InvalidMergeOptionException of unit | `InvalidRepositoryNameException of unit | `MaximumFileContentToLoadExceededException of unit | `MaximumItemsToCompareExceededException of unit | `MergeOptionRequiredException of unit | `RepositoryDoesNotExistException of unit | `RepositoryNameRequiredException of unit | `TipsDivergenceExceededException of unit | `Unknown_operation_error of string * string option ]
Sourceval error_of_xml : string -> Awso.Xml.t -> [> `CommitDoesNotExistException of unit | `CommitRequiredException of unit | `EncryptionIntegrityChecksFailedException of unit | `EncryptionKeyAccessDeniedException of unit | `EncryptionKeyDisabledException of unit | `EncryptionKeyNotFoundException of unit | `EncryptionKeyUnavailableException of unit | `InvalidCommitException of unit | `InvalidConflictDetailLevelException of unit | `InvalidConflictResolutionStrategyException of unit | `InvalidContinuationTokenException of unit | `InvalidMaxConflictFilesException of unit | `InvalidMaxMergeHunksException of unit | `InvalidMergeOptionException of unit | `InvalidRepositoryNameException of unit | `MaximumFileContentToLoadExceededException of unit | `MaximumItemsToCompareExceededException of unit | `MergeOptionRequiredException of unit | `RepositoryDoesNotExistException of unit | `RepositoryNameRequiredException of unit | `TipsDivergenceExceededException of unit | `Unknown_operation_error of string * string option ]
Sourceval error_to_json : error -> Yojson.Safe.t
Sourceval to_value : t -> [> `Structure of (string * [> `List of [> `Structure of (string * [> `List of [> `Structure of (string * [> `Boolean of IsHunkConflict.t | `Structure of (string * [> `Integer of LineNumber.t | `String of HunkContent.t ]) list ]) list ] list | `String of Path.t | `Structure of (string * [> `Boolean of IsContentConflict.t | `Integer of NumberOfConflicts.t | `String of Path.t | `Structure of (string * [> `Boolean of CapitalBoolean.t | `Enum of string | `Long of FileSize.t ]) list ]) list ]) list ] list | `String of NextToken.t ]) list ]
Sourceval to_query : t -> Awso.Client.Query.t
Sourceval of_xml : Awso.Xml.t -> t
Sourceval of_string : string -> t
Sourceval of_json : Yojson.Safe.t -> t
Sourceval to_json : t -> Yojson.Safe.t