aws codecommit merge-branches-by-three-way

Merges two specified branches using the three-way merge strategy. AWS CLI reference

10 options Its page in the AWS CLI reference

Options

10 in the AWS CLI reference

--author-nameThe name of the author who created the commit.

--commit-messageThe commit message to include in the commit information for the merge.

--conflict-detail-levelThe level of conflict detail to use.

--conflict-resolution-strategySpecifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.

--conflict-resolutionIf AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

--destination-commit-specifier, --source-commit-specifierThe branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

--emailThe email address of the person merging the branches.

--keep-empty-foldersIf the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.

--repository-nameThe name of the repository where you want to merge two branches.

--target-branchThe branch where the merge is applied.