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

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

Inherits:
Struct
  • Object
show all
Defined in:
gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb

Overview

Information about conflicts in a merge operation.

Instance Attribute Summary collapse

Instance Attribute Details

#conflict_metadataTypes::ConflictMetadata

Metadata about a conflict in a merge operation.



557
558
559
560
561
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 557

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

#merge_hunksArray<Types::MergeHunk>

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

Returns:



557
558
559
560
561
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 557

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