Merges two specified branches using the three-way merge strategy.
See https://www.paws-r-sdk.com/docs/codecommit_merge_branches_by_three_way/ for full documentation.
codecommit_merge_branches_by_three_way(
repositoryName,
sourceCommitSpecifier,
destinationCommitSpecifier,
targetBranch = NULL,
conflictDetailLevel = NULL,
conflictResolutionStrategy = NULL,
authorName = NULL,
email = NULL,
commitMessage = NULL,
keepEmptyFolders = NULL,
conflictResolution = NULL
)[required] The name of the repository where you want to merge two branches.
[required] The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
[required] The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
The branch where the merge is applied.
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.
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.
The name of the author who created the commit. This information is used as both the author and committer for the commit.
The email address of the person merging the branches. This information is used in the commit information for the merge.
The commit message to include in the commit information for the merge.
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.
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.