class Aws::CodeCommit::Types::BatchDescribeMergeConflictsInput
@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/BatchDescribeMergeConflictsInput AWS API Documentation
@return [String]
next batch of the results.
An enumeration token that, when provided in a request, returns the
@!attribute [rw] next_token
@return [String]
the merge operation is successful.
is NONE, which requires any conflicts to be resolved manually before
to attempt automatically merging two versions of a file. The default
Specifies which branch to use when resolving conflicts, or whether
@!attribute [rw] conflict_resolution_strategy
@return [String]
in both branches has differences on the same line.
specified, a conflict is considered not mergeable if the same file
same file has differences in both branches. If LINE_LEVEL is
FILE_LEVEL is used, which returns a not-mergeable result if the
The level of conflict detail to use. If unspecified, the default
@!attribute [rw] conflict_detail_level
@return [Array<String>]
specified, the default is all conflict files.
The path of the target files used to describe the conflicts. If not
@!attribute [rw] file_paths
@return [Integer]
The maximum number of files to include in the output.
@!attribute [rw] max_conflict_files
@return [Integer]
The maximum number of merge hunks to include in the output.
@!attribute [rw] max_merge_hunks
@return [String]
The merge option or strategy you want to use to merge the code.
@!attribute [rw] merge_option
@return [String]
identify a commit (for example, a branch name or a full commit ID).
The branch, tag, HEAD, or other fully qualified reference used to
@!attribute [rw] source_commit_specifier
@return [String]
identify a commit (for example, a branch name or a full commit ID).
The branch, tag, HEAD, or other fully qualified reference used to
@!attribute [rw] destination_commit_specifier
@return [String]
want to review.
The name of the repository that contains the merge conflicts you
@!attribute [rw] repository_name