Module Values.MergeBranchesByThreeWayOutputSource

Merges two specified branches using the three-way merge strategy.

Sourcetype nonrec t = {
  1. commitId : ObjectId.t option;
    (*

    The commit ID of the merge in the destination or target branch.

    *)
  2. treeId : ObjectId.t option;
    (*

    The tree ID of the merge in the destination or target branch.

    *)
}
Sourcetype nonrec error = [
  1. | `BranchDoesNotExistException of BranchDoesNotExistException.t
  2. | `BranchNameIsTagNameException of BranchNameIsTagNameException.t
  3. | `BranchNameRequiredException of BranchNameRequiredException.t
  4. | `CommitDoesNotExistException of CommitDoesNotExistException.t
  5. | `CommitMessageLengthExceededException of CommitMessageLengthExceededException.t
  6. | `CommitRequiredException of CommitRequiredException.t
  7. | `ConcurrentReferenceUpdateException of ConcurrentReferenceUpdateException.t
  8. | `EncryptionIntegrityChecksFailedException of EncryptionIntegrityChecksFailedException.t
  9. | `EncryptionKeyAccessDeniedException of EncryptionKeyAccessDeniedException.t
  10. | `EncryptionKeyDisabledException of EncryptionKeyDisabledException.t
  11. | `EncryptionKeyNotFoundException of EncryptionKeyNotFoundException.t
  12. | `EncryptionKeyUnavailableException of EncryptionKeyUnavailableException.t
  13. | `FileContentSizeLimitExceededException of FileContentSizeLimitExceededException.t
  14. | `FileModeRequiredException of FileModeRequiredException.t
  15. | `FolderContentSizeLimitExceededException of FolderContentSizeLimitExceededException.t
  16. | `InvalidBranchNameException of InvalidBranchNameException.t
  17. | `InvalidCommitException of InvalidCommitException.t
  18. | `InvalidConflictDetailLevelException of InvalidConflictDetailLevelException.t
  19. | `InvalidConflictResolutionException of InvalidConflictResolutionException.t
  20. | `InvalidConflictResolutionStrategyException of InvalidConflictResolutionStrategyException.t
  21. | `InvalidEmailException of InvalidEmailException.t
  22. | `InvalidFileModeException of InvalidFileModeException.t
  23. | `InvalidPathException of InvalidPathException.t
  24. | `InvalidReplacementContentException of InvalidReplacementContentException.t
  25. | `InvalidReplacementTypeException of InvalidReplacementTypeException.t
  26. | `InvalidRepositoryNameException of InvalidRepositoryNameException.t
  27. | `InvalidTargetBranchException of InvalidTargetBranchException.t
  28. | `ManualMergeRequiredException of ManualMergeRequiredException.t
  29. | `MaximumConflictResolutionEntriesExceededException of MaximumConflictResolutionEntriesExceededException.t
  30. | `MaximumFileContentToLoadExceededException of MaximumFileContentToLoadExceededException.t
  31. | `MaximumItemsToCompareExceededException of MaximumItemsToCompareExceededException.t
  32. | `MultipleConflictResolutionEntriesException of MultipleConflictResolutionEntriesException.t
  33. | `NameLengthExceededException of NameLengthExceededException.t
  34. | `PathRequiredException of PathRequiredException.t
  35. | `ReplacementContentRequiredException of ReplacementContentRequiredException.t
  36. | `ReplacementTypeRequiredException of ReplacementTypeRequiredException.t
  37. | `RepositoryDoesNotExistException of RepositoryDoesNotExistException.t
  38. | `RepositoryNameRequiredException of RepositoryNameRequiredException.t
  39. | `TipsDivergenceExceededException of TipsDivergenceExceededException.t
  40. | `Unknown_operation_error of string * string option
]
Sourceval make : ?commitId:??? -> ?treeId:??? -> unit -> t
Sourceval error_of_json : string -> Yojson.Safe.t -> [> `BranchDoesNotExistException of unit | `BranchNameIsTagNameException of unit | `BranchNameRequiredException of unit | `CommitDoesNotExistException of unit | `CommitMessageLengthExceededException of unit | `CommitRequiredException of unit | `ConcurrentReferenceUpdateException of unit | `EncryptionIntegrityChecksFailedException of unit | `EncryptionKeyAccessDeniedException of unit | `EncryptionKeyDisabledException of unit | `EncryptionKeyNotFoundException of unit | `EncryptionKeyUnavailableException of unit | `FileContentSizeLimitExceededException of unit | `FileModeRequiredException of unit | `FolderContentSizeLimitExceededException of unit | `InvalidBranchNameException of unit | `InvalidCommitException of unit | `InvalidConflictDetailLevelException of unit | `InvalidConflictResolutionException of unit | `InvalidConflictResolutionStrategyException of unit | `InvalidEmailException of unit | `InvalidFileModeException of unit | `InvalidPathException of unit | `InvalidReplacementContentException of unit | `InvalidReplacementTypeException of unit | `InvalidRepositoryNameException of unit | `InvalidTargetBranchException of unit | `ManualMergeRequiredException of unit | `MaximumConflictResolutionEntriesExceededException of unit | `MaximumFileContentToLoadExceededException of unit | `MaximumItemsToCompareExceededException of unit | `MultipleConflictResolutionEntriesException of unit | `NameLengthExceededException of unit | `PathRequiredException of unit | `ReplacementContentRequiredException of unit | `ReplacementTypeRequiredException 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 -> [> `BranchDoesNotExistException of unit | `BranchNameIsTagNameException of unit | `BranchNameRequiredException of unit | `CommitDoesNotExistException of unit | `CommitMessageLengthExceededException of unit | `CommitRequiredException of unit | `ConcurrentReferenceUpdateException of unit | `EncryptionIntegrityChecksFailedException of unit | `EncryptionKeyAccessDeniedException of unit | `EncryptionKeyDisabledException of unit | `EncryptionKeyNotFoundException of unit | `EncryptionKeyUnavailableException of unit | `FileContentSizeLimitExceededException of unit | `FileModeRequiredException of unit | `FolderContentSizeLimitExceededException of unit | `InvalidBranchNameException of unit | `InvalidCommitException of unit | `InvalidConflictDetailLevelException of unit | `InvalidConflictResolutionException of unit | `InvalidConflictResolutionStrategyException of unit | `InvalidEmailException of unit | `InvalidFileModeException of unit | `InvalidPathException of unit | `InvalidReplacementContentException of unit | `InvalidReplacementTypeException of unit | `InvalidRepositoryNameException of unit | `InvalidTargetBranchException of unit | `ManualMergeRequiredException of unit | `MaximumConflictResolutionEntriesExceededException of unit | `MaximumFileContentToLoadExceededException of unit | `MaximumItemsToCompareExceededException of unit | `MultipleConflictResolutionEntriesException of unit | `NameLengthExceededException of unit | `PathRequiredException of unit | `ReplacementContentRequiredException of unit | `ReplacementTypeRequiredException 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 * [> `String of ObjectId.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