You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.
Class: Aws::CodeCommit::Types::GetMergeConflictsInput
- Inherits:
-
Struct
- Object
- Struct
- Aws::CodeCommit::Types::GetMergeConflictsInput
- Defined in:
- (unknown)
Overview
When passing GetMergeConflictsInput as input to an Aws::Client method, you can use a vanilla 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
conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
max_conflict_files: 1,
conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
next_token: "NextToken",
}
Instance Attribute Summary collapse
-
#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).
-
#max_conflict_files ⇒ Integer
The maximum number of files 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 the pull request was created.
-
#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.
Possible values:
- FILE_LEVEL
- LINE_LEVEL
#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.
Possible values:
- NONE
- ACCEPT_SOURCE
- ACCEPT_DESTINATION
- AUTOMERGE
#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).
#max_conflict_files ⇒ Integer
The maximum number of files to include in the output.
#merge_option ⇒ String
The merge option or strategy you want to use to merge the code.
Possible values:
- FAST_FORWARD_MERGE
- SQUASH_MERGE
- THREE_WAY_MERGE
#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 the pull request was created.
#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).