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

Class: Aws::CodeCommit::Types::GetMergeConflictsInput

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

Overview

Note:

When making an API call, you may pass GetMergeConflictsInput data as a hash:

{
  repository_name: "RepositoryName", # required
  destination_commit_specifier: "CommitName", # required
  source_commit_specifier: "CommitName", # required
  merge_option: "FAST_FORWARD_MERGE", # required, accepts FAST_FORWARD_MERGE
}

Instance Attribute Summary collapse

Instance Attribute Details

#destination_commit_specifierString

The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.

Returns:

  • (String)


1079
1080
1081
1082
1083
1084
1085
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1079

class GetMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option)
  include Aws::Structure
end

#merge_optionString

The merge option or strategy you want to use to merge the code. The only valid value is FAST_FORWARD_MERGE.

Returns:

  • (String)


1079
1080
1081
1082
1083
1084
1085
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1079

class GetMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option)
  include Aws::Structure
end

#repository_nameString

The name of the repository where the pull request was created.

Returns:

  • (String)


1079
1080
1081
1082
1083
1084
1085
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1079

class GetMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option)
  include Aws::Structure
end

#source_commit_specifierString

The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.

Returns:

  • (String)


1079
1080
1081
1082
1083
1084
1085
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1079

class GetMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option)
  include Aws::Structure
end