class Aws::CodeCommit::Types::DescribeMergeConflictsInput

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/DescribeMergeConflictsInput 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 will be 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]
file in both branches has differences on the same line.
specified, a conflict will be considered not mergeable if the same
same file has differences in both branches. If LINE_LEVEL is
FILE_LEVEL is used, which will return a not mergeable result if the
The level of conflict detail to use. If unspecified, the default
@!attribute [rw] conflict_detail_level
@return [String]
The path of the target files used to describe the conflicts.
@!attribute [rw] file_path
@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]
merge conflict.
The name of the repository where you want to get information about a
@!attribute [rw] repository_name
}
next_token: “NextToken”,
conflict_resolution_strategy: “NONE”, # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
conflict_detail_level: “FILE_LEVEL”, # accepts FILE_LEVEL, LINE_LEVEL
file_path: “Path”, # required
max_merge_hunks: 1,
merge_option: “FAST_FORWARD_MERGE”, # required, accepts FAST_FORWARD_MERGE, SQUASH_MERGE, THREE_WAY_MERGE
source_commit_specifier: “CommitName”, # required
destination_commit_specifier: “CommitName”, # required
repository_name: “RepositoryName”, # required
{
data as a hash:
@note When making an API call, you may pass DescribeMergeConflictsInput