| Package | Description |
|---|---|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
ReplaceContentEntry |
ReplaceContentEntry.clone() |
ReplaceContentEntry |
ReplaceContentEntry.withContent(ByteBuffer content)
The base-64 encoded content to use when the replacement type is USE_NEW_CONTENT.
|
ReplaceContentEntry |
ReplaceContentEntry.withFileMode(FileModeTypeEnum fileMode)
The file mode to apply during conflict resoltion.
|
ReplaceContentEntry |
ReplaceContentEntry.withFileMode(String fileMode)
The file mode to apply during conflict resoltion.
|
ReplaceContentEntry |
ReplaceContentEntry.withFilePath(String filePath)
The path of the conflicting file.
|
ReplaceContentEntry |
ReplaceContentEntry.withReplacementType(ReplacementTypeEnum replacementType)
The replacement type to use when determining how to resolve the conflict.
|
ReplaceContentEntry |
ReplaceContentEntry.withReplacementType(String replacementType)
The replacement type to use when determining how to resolve the conflict.
|
| Modifier and Type | Method and Description |
|---|---|
List<ReplaceContentEntry> |
ConflictResolution.getReplaceContents()
Files that will have content replaced as part of the merge conflict resolution.
|
| Modifier and Type | Method and Description |
|---|---|
ConflictResolution |
ConflictResolution.withReplaceContents(ReplaceContentEntry... replaceContents)
Files that will have content replaced as part of the merge conflict resolution.
|
| Modifier and Type | Method and Description |
|---|---|
void |
ConflictResolution.setReplaceContents(Collection<ReplaceContentEntry> replaceContents)
Files that will have content replaced as part of the merge conflict resolution.
|
ConflictResolution |
ConflictResolution.withReplaceContents(Collection<ReplaceContentEntry> replaceContents)
Files that will have content replaced as part of the merge conflict resolution.
|
Copyright © 2019. All rights reserved.