Class: Aws::CodeCommit::Types::GetMergeConflictsOutput

Inherits:

Struct

• Object
• Struct
• Aws::CodeCommit::Types::GetMergeConflictsOutput

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

  A list of metadata for any conflicting files.

• #destination_commit_id ⇒ String

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

• #mergeable ⇒ Boolean

  A Boolean value that indicates whether the code is mergeable by the specified merge option.

• #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 3364

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#conflict_metadata_list ⇒ Array<Types::ConflictMetadata>

A list of metadata for any conflicting files. If the specified merge strategy is FAST_FORWARD_MERGE, this list is always empty.

Returns:

• (Array<Types::ConflictMetadata>)

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

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  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 3364

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#mergeable ⇒ Boolean

A Boolean value that indicates whether the code is mergeable by the specified merge option.

Returns:

• (Boolean)

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

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  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 3364

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  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 3364

class GetMergeConflictsOutput < Struct.new(
  :mergeable,
  :destination_commit_id,
  :source_commit_id,
  :base_commit_id,
  :conflict_metadata_list,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end