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

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

Inherits:
Struct
  • Object
show all
Defined in:
(unknown)

Overview

Returned by:

See Also:

Instance Attribute Summary collapse

Instance Attribute Details

#base_commit_id ⇒ String

The commit ID of the merge base.

Returns:

  • (String) —

    The commit ID of the merge base.

#conflict_metadata ⇒ Types::ConflictMetadata

Contains metadata about the conflicts found in the merge.

Returns:

#destination_commit_id ⇒ String

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

Returns:

  • (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.

Returns:

  • (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.

Returns:

  • (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.

Returns:

  • (String) —

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