Class: Aws::CodeCommit::Types::DescribeMergeConflictsOutput

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

Overview

Constant Summary collapse

SENSITIVE =
[]

Instance Attribute Summary collapse

Instance Attribute Details

#base_commit_idString

The commit ID of the merge base.

Returns:

  • (String)


2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#conflict_metadataTypes::ConflictMetadata

Contains metadata about the conflicts found in the merge.



2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#destination_commit_idString

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

Returns:

  • (String)


2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#merge_hunksArray<Types::MergeHunk>

A list of merge hunks of the differences between the files or lines.

Returns:



2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  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)


2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end

#source_commit_idString

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

Returns:

  • (String)


2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 2385

class DescribeMergeConflictsOutput < Struct.new(
  :conflict_metadata,
  :merge_hunks,
  :next_token,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id)
  SENSITIVE = []
  include Aws::Structure
end