codecommit/aws.sdk.kotlin.services.codecommit.model/Conflict

Conflict

class Conflict

Information about conflicts in a merge operation.

Types

Link copied to clipboard
class Builder
Link copied to clipboard
object Companion

Properties

Link copied to clipboard
val conflictMetadata: ConflictMetadata?

Metadata about a conflict in a merge operation.

Link copied to clipboard
val mergeHunks: List<MergeHunk>?

A list of hunks that contain the differences between files or lines causing the conflict.

Functions

Link copied to clipboard
inline fun copy(block: Conflict.Builder.() -> Unit = {}): Conflict
Link copied to clipboard
open operator override fun equals(other: Any?): Boolean
Link copied to clipboard
open override fun hashCode(): Int
Link copied to clipboard
open override fun toString(): String