| Package | Description |
|---|---|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
ConflictMetadata |
ConflictMetadata.clone() |
ConflictMetadata |
DescribeMergeConflictsResult.getConflictMetadata()
Contains metadata about the conflicts found in the merge.
|
ConflictMetadata |
Conflict.getConflictMetadata()
Metadata about a conflict in a merge operation.
|
ConflictMetadata |
ConflictMetadata.withContentConflict(Boolean contentConflict)
A boolean value indicating whether there are conflicts in the content of a file.
|
ConflictMetadata |
ConflictMetadata.withFileModeConflict(Boolean fileModeConflict)
A boolean value indicating whether there are conflicts in the file mode of a file.
|
ConflictMetadata |
ConflictMetadata.withFileModes(FileModes fileModes)
The file modes of the file in the source, destination, and base of the merge.
|
ConflictMetadata |
ConflictMetadata.withFilePath(String filePath)
The path of the file that contains conflicts.
|
ConflictMetadata |
ConflictMetadata.withFileSizes(FileSizes fileSizes)
The file sizes of the file in the source, destination, and base of the merge.
|
ConflictMetadata |
ConflictMetadata.withIsBinaryFile(IsBinaryFile isBinaryFile)
A boolean value (true or false) indicating whether the file is binary or textual in the source, destination, and
base of the merge.
|
ConflictMetadata |
ConflictMetadata.withMergeOperations(MergeOperations mergeOperations)
Whether an add, modify, or delete operation caused the conflict between the source and destination of the merge.
|
ConflictMetadata |
ConflictMetadata.withNumberOfConflicts(Integer numberOfConflicts)
The number of conflicts, including both hunk conflicts and metadata conflicts.
|
ConflictMetadata |
ConflictMetadata.withObjectTypeConflict(Boolean objectTypeConflict)
A boolean value (true or false) indicating whether there are conflicts between the branches in the object type of
a file, folder, or submodule.
|
ConflictMetadata |
ConflictMetadata.withObjectTypes(ObjectTypes objectTypes)
Information about any object type conflicts in a merge operation.
|
| Modifier and Type | Method and Description |
|---|---|
List<ConflictMetadata> |
GetMergeConflictsResult.getConflictMetadataList()
A list of metadata for any conflicting files.
|
| Modifier and Type | Method and Description |
|---|---|
void |
DescribeMergeConflictsResult.setConflictMetadata(ConflictMetadata conflictMetadata)
Contains metadata about the conflicts found in the merge.
|
void |
Conflict.setConflictMetadata(ConflictMetadata conflictMetadata)
Metadata about a conflict in a merge operation.
|
DescribeMergeConflictsResult |
DescribeMergeConflictsResult.withConflictMetadata(ConflictMetadata conflictMetadata)
Contains metadata about the conflicts found in the merge.
|
Conflict |
Conflict.withConflictMetadata(ConflictMetadata conflictMetadata)
Metadata about a conflict in a merge operation.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withConflictMetadataList(ConflictMetadata... conflictMetadataList)
A list of metadata for any conflicting files.
|
| Modifier and Type | Method and Description |
|---|---|
void |
GetMergeConflictsResult.setConflictMetadataList(Collection<ConflictMetadata> conflictMetadataList)
A list of metadata for any conflicting files.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withConflictMetadataList(Collection<ConflictMetadata> conflictMetadataList)
A list of metadata for any conflicting files.
|
Copyright © 2023. All rights reserved.