AWS services or capabilities described in AWS Documentation may vary by region/location. Click Getting Started with Amazon AWS to see specific differences applicable to the China (Beijing) Region.
Merges two specified branches using the three-way merge strategy.
For .NET Core this operation is only available in asynchronous form. Please refer to MergeBranchesByThreeWayAsync.
Namespace: Amazon.CodeCommit
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public virtual MergeBranchesByThreeWayResponse MergeBranchesByThreeWay( MergeBranchesByThreeWayRequest request )
Container for the necessary parameters to execute the MergeBranchesByThreeWay service method.
| Exception | Condition |
|---|---|
| BranchDoesNotExistException | The specified branch does not exist. |
| BranchNameIsTagNameException | The specified branch name is not valid because it is a tag name. Enter the name of a branch in the repository. For a list of valid branch names, use ListBranches. |
| BranchNameRequiredException | A branch name is required, but was not specified. |
| CommitDoesNotExistException | The specified commit does not exist or no commit was specified, and the specified repository has no default branch. |
| CommitMessageLengthExceededException | The commit message is too long. Provide a shorter string. |
| CommitRequiredException | A commit was not specified. |
| ConcurrentReferenceUpdateException | The merge cannot be completed because the target branch has been modified. Another user might have modified the target branch while the merge was in progress. Wait a few minutes, and then try again. |
| EncryptionIntegrityChecksFailedException | An encryption integrity check failed. |
| EncryptionKeyAccessDeniedException | An encryption key could not be accessed. |
| EncryptionKeyDisabledException | The encryption key is disabled. |
| EncryptionKeyNotFoundException | No encryption key was found. |
| EncryptionKeyUnavailableException | The encryption key is not available. |
| FileContentSizeLimitExceededException | The file cannot be added because it is too large. The maximum file size is 6 MB, and the combined file content change size is 7 MB. Consider making these changes using a Git client. |
| FileModeRequiredException | The commit cannot be created because no file mode has been specified. A file mode is required to update mode permissions for a file. |
| FolderContentSizeLimitExceededException | The commit cannot be created because at least one of the overall changes in the commit results in a folder whose contents exceed the limit of 6 MB. Either reduce the number and size of your changes, or split the changes across multiple folders. |
| InvalidBranchNameException | The specified reference name is not valid. |
| InvalidCommitException | The specified commit is not valid. |
| InvalidConflictDetailLevelException | The specified conflict detail level is not valid. |
| InvalidConflictResolutionException | The specified conflict resolution list is not valid. |
| InvalidConflictResolutionStrategyException | The specified conflict resolution strategy is not valid. |
| InvalidEmailException | The specified email address either contains one or more characters that are not allowed, or it exceeds the maximum number of characters allowed for an email address. |
| InvalidFileModeException | The specified file mode permission is not valid. For a list of valid file mode permissions, see PutFile. |
| InvalidPathException | The specified path is not valid. |
| InvalidReplacementContentException | Automerge was specified for resolving the conflict, but the replacement type is not valid or content is missing. |
| InvalidReplacementTypeException | Automerge was specified for resolving the conflict, but the specified replacement type is not valid. |
| InvalidRepositoryNameException | A specified repository name is not valid. This exception occurs only when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist. |
| InvalidTargetBranchException | The specified target branch is not valid. |
| ManualMergeRequiredException | The pull request cannot be merged automatically into the destination branch. You must manually merge the branches and resolve any conflicts. |
| MaximumConflictResolutionEntriesExceededException | The number of allowed conflict resolution entries was exceeded. |
| MaximumFileContentToLoadExceededException | The number of files to load exceeds the allowed limit. |
| MaximumItemsToCompareExceededException | The number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed. |
| MultipleConflictResolutionEntriesException | More than one conflict resolution entries exists for the conflict. A conflict can have only one conflict resolution entry. |
| NameLengthExceededException | The user name is not valid because it has exceeded the character limit for author names. |
| PathRequiredException | The folderPath for a location cannot be null. |
| ReplacementContentRequiredException | USE_NEW_CONTENT was specified, but no replacement content has been provided. |
| ReplacementTypeRequiredException | A replacement type is required. |
| RepositoryDoesNotExistException | The specified repository does not exist. |
| RepositoryNameRequiredException | A repository name is required, but was not specified. |
| TipsDivergenceExceededException | The divergence between the tips of the provided commit specifiers is too great to determine whether there might be any merge conflicts. Locally compare the specifiers using git diff or a diff tool. |
.NET Framework:
Supported in: 4.5, 4.0, 3.5