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

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)


3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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_listArray<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:



3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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_idString

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

Returns:

  • (String)


3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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

#mergeableBoolean

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

Returns:

  • (Boolean)


3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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_tokenString

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

Returns:

  • (String)


3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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_idString

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

Returns:

  • (String)


3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3681

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