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

Inherits:

Struct

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

Defined in:

gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb

Overview

Information about conflicts in a merge operation.

See Also:

• AWS API Documentation

Constant Summary

SENSITIVE =

[]

Instance Attribute Summary

• #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)

# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1161

class Conflict < Struct.new(
  :conflict_metadata,
  :merge_hunks)
  SENSITIVE = []
  include Aws::Structure
end

#merge_hunks ⇒ Array<Types::MergeHunk>

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

Returns:

• (Array<Types::MergeHunk>)

# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1161

class Conflict < Struct.new(
  :conflict_metadata,
  :merge_hunks)
  SENSITIVE = []
  include Aws::Structure
end