| Package | Description |
|---|---|
| software.amazon.awssdk.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
static ConflictResolution.Builder |
ConflictResolution.builder() |
ConflictResolution.Builder |
ConflictResolution.Builder.deleteFiles(Collection<DeleteFileEntry> deleteFiles)
Files to be deleted as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.deleteFiles(Consumer<DeleteFileEntry.Builder>... deleteFiles)
Files to be deleted as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.deleteFiles(DeleteFileEntry... deleteFiles)
Files to be deleted as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.replaceContents(Collection<ReplaceContentEntry> replaceContents)
Files to have content replaced as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.replaceContents(Consumer<ReplaceContentEntry.Builder>... replaceContents)
Files to have content replaced as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.replaceContents(ReplaceContentEntry... replaceContents)
Files to have content replaced as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.setFileModes(Collection<SetFileModeEntry> setFileModes)
File modes that are set as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.setFileModes(Consumer<SetFileModeEntry.Builder>... setFileModes)
File modes that are set as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.Builder.setFileModes(SetFileModeEntry... setFileModes)
File modes that are set as part of the merge conflict resolution.
|
ConflictResolution.Builder |
ConflictResolution.toBuilder() |
| Modifier and Type | Method and Description |
|---|---|
static Class<? extends ConflictResolution.Builder> |
ConflictResolution.serializableBuilderClass() |
| Modifier and Type | Method and Description |
|---|---|
default MergeBranchesBySquashRequest.Builder |
MergeBranchesBySquashRequest.Builder.conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
default MergePullRequestByThreeWayRequest.Builder |
MergePullRequestByThreeWayRequest.Builder.conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
default CreateUnreferencedMergeCommitRequest.Builder |
CreateUnreferencedMergeCommitRequest.Builder.conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
default MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
default MergePullRequestBySquashRequest.Builder |
MergePullRequestBySquashRequest.Builder.conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
Copyright © 2021. All rights reserved.