Class: Aws::CodeCommit::Types::DescribeMergeConflictsInput

Inherits:

Struct

• Object
• Struct
• Aws::CodeCommit::Types::DescribeMergeConflictsInput

Includes:

Structure

Defined in:

lib/aws-sdk-codecommit/types.rb

Overview

See Also:

• AWS API Documentation

Constant Summary

SENSITIVE =

[]

Instance Attribute Summary

• #conflict_detail_level ⇒ String

  The level of conflict detail to use.

• #conflict_resolution_strategy ⇒ String

  Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.

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

• #file_path ⇒ String

  The path of the target files used to describe the conflicts.

• #max_merge_hunks ⇒ Integer

  The maximum number of merge hunks to include in the output.

• #merge_option ⇒ String

  The merge option or strategy you want to use to merge the code.

• #next_token ⇒ String

  An enumeration token that, when provided in a request, returns the next batch of the results.

• #repository_name ⇒ String

  The name of the repository where you want to get information about a merge conflict.

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

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.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  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.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  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).

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#file_path ⇒ String

The path of the target files used to describe the conflicts.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#max_merge_hunks ⇒ Integer

The maximum number of merge hunks to include in the output.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#merge_option ⇒ String

The merge option or strategy you want to use to merge the code.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#next_token ⇒ String

An enumeration token that, when provided in a request, returns the next batch of the results.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end

#repository_name ⇒ String

The name of the repository where you want to get information about a merge conflict.

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  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).

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

class DescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :file_path,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  SENSITIVE = []
  include Aws::Structure
end