Module Values.DescribeMergeConflictsInputSource

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.

Sourcetype nonrec t = {
  1. repositoryName : RepositoryName.t;
    (*

    The name of the repository where you want to get information about a merge conflict.

    *)
  2. destinationCommitSpecifier : CommitName.t;
    (*

    The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

    *)
  3. sourceCommitSpecifier : CommitName.t;
    (*

    The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

    *)
  4. mergeOption : MergeOptionTypeEnum.t;
    (*

    The merge option or strategy you want to use to merge the code.

    *)
  5. maxMergeHunks : MaxResults.t option;
    (*

    The maximum number of merge hunks to include in the output.

    *)
  6. filePath : Path.t;
    (*

    The path of the target files used to describe the conflicts.

    *)
  7. conflictDetailLevel : ConflictDetailLevelTypeEnum.t option;
    (*

    The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

    *)
  8. conflictResolutionStrategy : ConflictResolutionStrategyTypeEnum.t option;
    (*

    Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

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

    An enumeration token that, when provided in a request, returns the next batch of the results.

    *)
}
Sourceval context_ : string
Sourceval make : ?maxMergeHunks:??? -> ?conflictDetailLevel:??? -> ?conflictResolutionStrategy:??? -> ?nextToken:??? -> repositoryName:RepositoryName.t -> destinationCommitSpecifier:CommitName.t -> sourceCommitSpecifier:CommitName.t -> mergeOption:MergeOptionTypeEnum.t -> filePath:Path.t -> unit -> t
Sourceval to_value : t -> [> `Structure of (string * [> `Enum of string | `Integer of MaxResults.t | `String of RepositoryName.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