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

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

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

Overview

Instance Attribute Summary collapse

Instance Attribute Details

#base_commit_idString

The commit ID of the merge base.

Returns:

  • (String)


149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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

#conflictsArray<Types::Conflict>

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

Returns:



149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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

#destination_commit_idString

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

Returns:

  • (String)


149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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

#errorsArray<Types::BatchDescribeMergeConflictsError>

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



149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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

#next_tokenString

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

Returns:

  • (String)


149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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

#source_commit_idString

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

Returns:

  • (String)


149
150
151
152
153
154
155
156
157
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 149

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