ConflictMetadata

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

Types

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

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

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

The path of the file that contains conflicts.

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

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

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

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

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

Information about any object type conflicts in a merge operation.

open operator override fun equals(other: Any?): Boolean

open override fun hashCode(): Int

open override fun toString(): String