class Aws::CodeCommit::Types::MergeBranchesByThreeWayInput

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergeBranchesByThreeWayInput AWS API Documentation
@return [Types::ConflictResolution]
to use when resolving conflicts during a merge.
If AUTOMERGE is the conflict resolution strategy, a list of inputs
@!attribute [rw] conflict_resolution
@return [Boolean]
.gitkeep file is created for empty folders. The default is false.
structure if the changes leave the folders empty. If true, a
If the commit contains deletions, whether to keep a folder or folder
@!attribute [rw] keep_empty_folders
@return [String]
merge.
The commit message to include in the commit information for the
@!attribute [rw] commit_message
@return [String]
information is used in the commit information for the merge.
The email address of the person merging the branches. This
@!attribute [rw] email
@return [String]
used as both the author and committer for the commit.
The name of the author who created the commit. This information is
@!attribute [rw] author_name
@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 [String]
The branch where the merge is applied.
@!attribute [rw] target_branch
@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]
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]
The name of the repository where you want to merge two branches.
@!attribute [rw] repository_name