| Package | Description |
|---|---|
| software.amazon.awssdk.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
static Conflict.Builder |
Conflict.builder() |
Conflict.Builder |
Conflict.Builder.conflictMetadata(ConflictMetadata conflictMetadata)
Metadata about a conflict in a merge operation.
|
default Conflict.Builder |
Conflict.Builder.conflictMetadata(Consumer<ConflictMetadata.Builder> conflictMetadata)
Metadata about a conflict in a merge operation.
|
Conflict.Builder |
Conflict.Builder.mergeHunks(Collection<MergeHunk> mergeHunks)
A list of hunks that contain the differences between files or lines causing the conflict.
|
Conflict.Builder |
Conflict.Builder.mergeHunks(Consumer<MergeHunk.Builder>... mergeHunks)
A list of hunks that contain the differences between files or lines causing the conflict.
|
Conflict.Builder |
Conflict.Builder.mergeHunks(MergeHunk... mergeHunks)
A list of hunks that contain the differences between files or lines causing the conflict.
|
Conflict.Builder |
Conflict.toBuilder() |
| Modifier and Type | Method and Description |
|---|---|
static Class<? extends Conflict.Builder> |
Conflict.serializableBuilderClass() |
Copyright © 2022. All rights reserved.