Class: Aws::CodeCommit::Types::GetMergeCommitInput

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

Overview

See Also:

Constant Summary collapse

SENSITIVE = 
[]

Instance Attribute Summary collapse

Instance Attribute Details

#conflict_detail_level ⇒ String

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) 


3233
3234
3235
3236
3237
3238
3239
3240
3241
 
# File 'lib/aws-sdk-codecommit/types.rb', line 3233

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

#conflict_resolution_strategy ⇒ String

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) 


3233
3234
3235
3236
3237
3238
3239
3240
3241
 
# File 'lib/aws-sdk-codecommit/types.rb', line 3233

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

#destination_commit_specifier ⇒ String

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) 


3233
3234
3235
3236
3237
3238
3239
3240
3241
 
# File 'lib/aws-sdk-codecommit/types.rb', line 3233

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

#repository_name ⇒ String

The name of the repository that contains the merge commit about which you want to get information.

Returns:

  • (String) 


3233
3234
3235
3236
3237
3238
3239
3240
3241
 
# File 'lib/aws-sdk-codecommit/types.rb', line 3233

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

#source_commit_specifier ⇒ String

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) 


3233
3234
3235
3236
3237
3238
3239
3240
3241
 
# File 'lib/aws-sdk-codecommit/types.rb', line 3233

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