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

ConflictResolution

class ConflictResolution

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Types

object Companion

Properties

val deleteFiles: List<DeleteFileEntry>?

Files to be deleted as part of the merge conflict resolution.

replaceContents

val replaceContents: List<ReplaceContentEntry>?

Files to have content replaced as part of the merge conflict resolution.

val setFileModes: List<SetFileModeEntry>?

File modes that are set as part of the merge conflict resolution.

Functions

inline fun copy(block: ConflictResolution.Builder.() -> Unit = {}): ConflictResolution

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

open override fun hashCode(): Int

open override fun toString(): String