You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.

Class: Aws::CodeCommit::Types::Conflict

Inherits:

Struct

Object
Struct
Aws::CodeCommit::Types::Conflict

show all

Defined in:: (unknown)

Overview

Information about conflicts in a merge operation.

See Also:

AWS API Documentation

Instance Attribute Summary collapse

#conflict_metadata ⇒ Types::ConflictMetadata
Metadata about a conflict in a merge operation.
#merge_hunks ⇒ Array<Types::MergeHunk>
A list of hunks that contain the differences between files or lines causing the conflict.

Instance Attribute Details

#conflict_metadata ⇒ `Types::ConflictMetadata`

Metadata about a conflict in a merge operation.

Returns:

(Types::ConflictMetadata) —
Metadata about a conflict in a merge operation.

#merge_hunks ⇒ `Array<Types::MergeHunk>`

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

Returns:

(Array<Types::MergeHunk>) —
A list of hunks that contain the differences between files or lines causing the conflict.