class Aws::CodeCommit::Types::DescribeMergeConflictsInput
@note When making an API call, you may pass DescribeMergeConflictsInput
data as a hash: { repository_name: "RepositoryName", # required destination_commit_specifier: "CommitName", # required source_commit_specifier: "CommitName", # required merge_option: "FAST_FORWARD_MERGE", # required, accepts FAST_FORWARD_MERGE, SQUASH_MERGE, THREE_WAY_MERGE max_merge_hunks: 1, file_path: "Path", # required conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE next_token: "NextToken", }
@!attribute [rw] repository_name
The name of the repository where you want to get information about a merge conflict. @return [String]
@!attribute [rw] destination_commit_specifier
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID). @return [String]
@!attribute [rw] source_commit_specifier
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID). @return [String]
@!attribute [rw] merge_option
The merge option or strategy you want to use to merge the code. @return [String]
@!attribute [rw] max_merge_hunks
The maximum number of merge hunks to include in the output. @return [Integer]
@!attribute [rw] file_path
The path of the target files used to describe the conflicts. @return [String]
@!attribute [rw] conflict_detail_level
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. @return [String]
@!attribute [rw] conflict_resolution_strategy
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. @return [String]
@!attribute [rw] next_token
An enumeration token that, when provided in a request, returns the next batch of the results. @return [String]
@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/DescribeMergeConflictsInput AWS API Documentation
Constants
- SENSITIVE