merge_branches_by_fast_forward
async
¶
merge_branches_by_fast_forward(
repository_name: RepositoryName,
source_commit_specifier: CommitName,
destination_commit_specifier: CommitName,
*,
config_overrides: Optional[AsyncCodeCommitClientConfig] = None,
target_branch: Optional[BranchName] = None,
) -> MergeBranchesByFastForwardOutput
Merges two branches using the fast-forward merge strategy.
Parameters:
-
repository_name(RepositoryName) –The name of the repository where you want to merge two branches.
-
source_commit_specifier(CommitName) –The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
-
destination_commit_specifier(CommitName) –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(Optional[BranchName], default:None) –The branch where the merge is applied.
Raises:
-
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.
-
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.
-
InvalidBranchNameException–The specified reference name is not valid.
-
InvalidCommitException–The specified commit 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.
-
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 diffor a diff tool. -
UnknownServiceError–The service returned an error code this client does not model.
Source code in docs_src/capo_codecommit/_services/async_code_commit.py
4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 | |