You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.
Class: Aws::CodeCommit::Types::MergeBranchesByThreeWayInput
- Inherits:
-
Struct
- Object
- Struct
- Aws::CodeCommit::Types::MergeBranchesByThreeWayInput
- Defined in:
- (unknown)
Overview
When passing MergeBranchesByThreeWayInput as input to an Aws::Client method, you can use a vanilla Hash:
{
repository_name: "RepositoryName", # required
source_commit_specifier: "CommitName", # required
destination_commit_specifier: "CommitName", # required
target_branch: "BranchName",
conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
author_name: "Name",
email: "Email",
commit_message: "Message",
keep_empty_folders: false,
conflict_resolution: {
replace_contents: [
{
file_path: "Path", # required
replacement_type: "KEEP_BASE", # required, accepts KEEP_BASE, KEEP_SOURCE, KEEP_DESTINATION, USE_NEW_CONTENT
content: "data",
file_mode: "EXECUTABLE", # accepts EXECUTABLE, NORMAL, SYMLINK
},
],
delete_files: [
{
file_path: "Path", # required
},
],
set_file_modes: [
{
file_path: "Path", # required
file_mode: "EXECUTABLE", # required, accepts EXECUTABLE, NORMAL, SYMLINK
},
],
},
}
Instance Attribute Summary collapse
-
#author_name ⇒ String
The name of the author who created the commit.
-
#commit_message ⇒ String
The commit message to include in the commit information for the merge.
-
#conflict_detail_level ⇒ String
The level of conflict detail to use.
-
#conflict_resolution ⇒ Types::ConflictResolution
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
-
#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).
-
#email ⇒ String
The email address of the person merging the branches.
-
#keep_empty_folders ⇒ Boolean
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.
-
#repository_name ⇒ String
The name of the repository where you want to merge two branches.
-
#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).
-
#target_branch ⇒ String
The branch where the merge is applied.
Instance Attribute Details
#author_name ⇒ String
The name of the author who created the commit. This information is used as both the author and committer for the commit.
#commit_message ⇒ String
The commit message to include in the commit information for the merge.
#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 ⇒ Types::ConflictResolution
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
#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).
#email ⇒ String
The email address of the person merging the branches. This information is used in the commit information for the merge.
#keep_empty_folders ⇒ Boolean
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
#repository_name ⇒ String
The name of the repository where you want to merge two branches.
#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).
#target_branch ⇒ String
The branch where the merge is applied.