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

Inherits:

Struct

• Object
• Struct
• Aws::CodeCommit::Types::DescribeMergeConflictsOutput

Includes:

Structure

Defined in:

lib/aws-sdk-codecommit/types.rb

Overview

See Also:

• AWS API Documentation

Constant Summary

SENSITIVE =

[]

Instance Attribute Summary

• #base_commit_id ⇒ String

  The commit ID of the merge base.

• #conflict_metadata ⇒ Types::ConflictMetadata

  Contains metadata about the conflicts found in the merge.

• #destination_commit_id ⇒ String

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

• #merge_hunks ⇒ Array<Types::MergeHunk>

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

• #next_token ⇒ String

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

• #source_commit_id ⇒ String

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

Instance Attribute Details

#base_commit_id ⇒ String

The commit ID of the merge base.

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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_metadata ⇒ Types::ConflictMetadata

Contains metadata about the conflicts found in the merge.

Returns:

• (Types::ConflictMetadata)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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_id ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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_hunks ⇒ Array<Types::MergeHunk>

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

Returns:

• (Array<Types::MergeHunk>)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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_token ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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_id ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 2160

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