AWS services or capabilities described in AWS Documentation may vary by region/location. Click Getting Started with Amazon AWS to see specific differences applicable to the China (Beijing) Region.

Class: Aws::CodeCommit::Types::GetMergeOptionsInput

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 GetMergeOptionsInput data as a hash:

{
  repository_name: "RepositoryName", # required
  source_commit_specifier: "CommitName", # required
  destination_commit_specifier: "CommitName", # required
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
}

Constant Summary collapse

SENSITIVE =
[]

Instance Attribute Summary collapse

Instance Attribute Details

#conflict_detail_levelString

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

Returns:

  • (String)


3735
3736
3737
3738
3739
3740
3741
3742
3743
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3735

class GetMergeOptionsInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :conflict_detail_level,
  :conflict_resolution_strategy)
  SENSITIVE = []
  include Aws::Structure
end

#conflict_resolution_strategyString

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

Returns:

  • (String)


3735
3736
3737
3738
3739
3740
3741
3742
3743
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3735

class GetMergeOptionsInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :conflict_detail_level,
  :conflict_resolution_strategy)
  SENSITIVE = []
  include Aws::Structure
end

#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)


3735
3736
3737
3738
3739
3740
3741
3742
3743
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3735

class GetMergeOptionsInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :conflict_detail_level,
  :conflict_resolution_strategy)
  SENSITIVE = []
  include Aws::Structure
end

#repository_nameString

The name of the repository that contains the commits about which you want to get merge options.

Returns:

  • (String)


3735
3736
3737
3738
3739
3740
3741
3742
3743
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3735

class GetMergeOptionsInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :conflict_detail_level,
  :conflict_resolution_strategy)
  SENSITIVE = []
  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)


3735
3736
3737
3738
3739
3740
3741
3742
3743
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 3735

class GetMergeOptionsInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :conflict_detail_level,
  :conflict_resolution_strategy)
  SENSITIVE = []
  include Aws::Structure
end