MergeHunk (u.bd1fbe2ccff02fd1cddfdcb5f1e38e71.awso.0.9.1.doc.awso.codecommit.Awso

Sourcetype nonrec t = {

isConflict : IsHunkConflict.t option;
(*
A Boolean value indicating whether a combination of hunks contains a conflict. Conflicts occur when the same file or the same lines in a file were modified in both the source and destination of a merge or pull request. Valid values include true, false, and null. True when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge do not set this to true.
*)
source : MergeHunkDetail.t option;
(*
Information about the merge hunk in the source of a merge or pull request.
*)
destination : MergeHunkDetail.t option;
(*
Information about the merge hunk in the destination of a merge or pull request.
*)
base : MergeHunkDetail.t option;
(*
Information about the merge hunk in the base of a merge or pull request.
*)

}

val make : 
  ?isConflict:??? ->
  ?source:??? ->
  ?destination:??? ->
  ?base:??? ->
  unit ->
  t

Source

val to_value : 
  t ->
  [> `Structure of
       (string
        * [> `Boolean of IsHunkConflict.t
          | `Structure of
            (string * [> `Integer of LineNumber.t | `String of HunkContent.t ])
              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