Class: Aws::Types::Conflict

Inherits:

Object

• Object
• Aws::Types::Conflict

Defined in:

sig/types.rbs

Constant Summary

SENSITIVE =

Returns:

• ([])

Instance Attribute Summary

• #conflict_metadata ⇒ Types::ConflictMetadata

  Returns the value of attribute conflict_metadata.

• #merge_hunks ⇒ ::Array[Types::MergeHunk]

  Returns the value of attribute merge_hunks.

Instance Attribute Details

#conflict_metadata ⇒ Types::ConflictMetadata

Returns the value of attribute conflict_metadata.

Returns:

• (Types::ConflictMetadata)

# File 'sig/types.rbs', line 344

def conflict_metadata
  @conflict_metadata
end

#merge_hunks ⇒ ::Array[Types::MergeHunk]

Returns the value of attribute merge_hunks.

Returns:

• (::Array[Types::MergeHunk])

# File 'sig/types.rbs', line 345

def merge_hunks
  @merge_hunks
end