Class: Aws::CodeCommit::Types::BatchDescribeMergeConflictsInput

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) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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.

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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).

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

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

#file_paths ⇒ Array<String>

The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

Returns:

  • (Array<String>) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

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

#max_conflict_files ⇒ Integer

The maximum number of files to include in the output.

Returns:

  • (Integer) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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.

Returns:

  • (Integer) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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.

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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.

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

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

#repository_name ⇒ String

The name of the repository that contains the merge conflicts you want to review.

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :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).

Returns:

  • (String) 


454
455
456
457
458
459
460
461
462
463
464
465
466
467
 
# File 'lib/aws-sdk-codecommit/types.rb', line 454

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