Module Values.ConflictMetadataSource

Information about the metadata for a conflict in a merge operation.

Sourcetype nonrec t = {
  1. filePath : Path.t option;
    (*

    The path of the file that contains conflicts.

    *)
  2. fileSizes : FileSizes.t option;
    (*

    The file sizes of the file in the source, destination, and base of the merge.

    *)
  3. fileModes : FileModes.t option;
    (*

    The file modes of the file in the source, destination, and base of the merge.

    *)
  4. objectTypes : ObjectTypes.t option;
    (*

    Information about any object type conflicts in a merge operation.

    *)
  5. numberOfConflicts : NumberOfConflicts.t option;
    (*

    The number of conflicts, including both hunk conflicts and metadata conflicts.

    *)
  6. isBinaryFile : IsBinaryFile.t option;
    (*

    A boolean value (true or false) indicating whether the file is binary or textual in the source, destination, and base of the merge.

    *)
  7. contentConflict : IsContentConflict.t option;
    (*

    A boolean value indicating whether there are conflicts in the content of a file.

    *)
  8. fileModeConflict : IsFileModeConflict.t option;
    (*

    A boolean value indicating whether there are conflicts in the file mode of a file.

    *)
  9. objectTypeConflict : IsObjectTypeConflict.t option;
    (*

    A boolean value (true or false) indicating whether there are conflicts between the branches in the object type of a file, folder, or submodule.

    *)
  10. mergeOperations : MergeOperations.t option;
    (*

    Whether an add, modify, or delete operation caused the conflict between the source and destination of the merge.

    *)
}
Sourceval make : ?filePath:??? -> ?fileSizes:??? -> ?fileModes:??? -> ?objectTypes:??? -> ?numberOfConflicts:??? -> ?isBinaryFile:??? -> ?contentConflict:??? -> ?fileModeConflict:??? -> ?objectTypeConflict:??? -> ?mergeOperations:??? -> unit -> t
Sourceval to_value : 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 ]
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