Conflict (u.7f14852b978d6c0e0cad237e28f876a0.awso.0.9.1.doc.awso.codecommit.Awso

Sourcetype nonrec t = {

conflictMetadata : ConflictMetadata.t option;
(*
Metadata about a conflict in a merge operation.
*)
mergeHunks : MergeHunks.t option;
(*
A list of hunks that contain the differences between files or lines causing the conflict.
*)

}

Sourceval make : ?conflictMetadata:??? -> ?mergeHunks:??? -> unit -> t

val to_value : 
  t ->
  [> `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
          | `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 ]

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