| Package | Description |
|---|---|
| software.amazon.awssdk.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
List<MergeHunk> |
DescribeMergeConflictsResponse.mergeHunks()
A list of merge hunks of the differences between the files or lines.
|
List<MergeHunk> |
Conflict.mergeHunks()
A list of hunks that contain the differences between files or lines causing the conflict.
|
| Modifier and Type | Method and Description |
|---|---|
DescribeMergeConflictsResponse.Builder |
DescribeMergeConflictsResponse.Builder.mergeHunks(MergeHunk... mergeHunks)
A list of merge hunks of the differences between the files or lines.
|
Conflict.Builder |
Conflict.Builder.mergeHunks(MergeHunk... mergeHunks)
A list of hunks that contain the differences between files or lines causing the conflict.
|
| Modifier and Type | Method and Description |
|---|---|
DescribeMergeConflictsResponse.Builder |
DescribeMergeConflictsResponse.Builder.mergeHunks(Collection<MergeHunk> mergeHunks)
A list of merge hunks of the differences between the files or lines.
|
Conflict.Builder |
Conflict.Builder.mergeHunks(Collection<MergeHunk> mergeHunks)
A list of hunks that contain the differences between files or lines causing the conflict.
|
Copyright © 2020. All rights reserved.