Class: Aws::CodeCommit::Types::BatchDescribeMergeConflictsOutput

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

Overview

See Also:

Constant Summary collapse

SENSITIVE = 
[]

Instance Attribute Summary collapse

Instance Attribute Details

#base_commit_id ⇒ String

The commit ID of the merge base.

Returns:

  • (String) 


500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#conflicts ⇒ Array<Types::Conflict>

A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

Returns:



500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#destination_commit_id ⇒ String

The commit ID of the destination commit specifier that was used in the merge evaluation.

Returns:

  • (String) 


500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#errors ⇒ Array<Types::BatchDescribeMergeConflictsError>

A list of any errors returned while describing the merge conflicts for each file.

Returns:



500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#next_token ⇒ String

An enumeration token that can be used in a request to return the next batch of the results.

Returns:

  • (String) 


500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#source_commit_id ⇒ String

The commit ID of the source commit specifier that was used in the merge evaluation.

Returns:

  • (String) 


500
501
502
503
504
505
506
507
508
509
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 500

class BatchDescribeMergeConflictsOutput < Struct.new(
  :conflicts,
  :next_token,
  :errors,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end