Uses of Class
com.amazonaws.services.codecommit.model.ConflictResolution

Packages that use ConflictResolution

Package	Description
com.amazonaws.services.codecommit.model

Uses of ConflictResolution in com.amazonaws.services.codecommit.model

Methods in com.amazonaws.services.codecommit.model that return ConflictResolution

Modifier and Type	Method and Description
ConflictResolution	ConflictResolution.clone()
ConflictResolution	MergePullRequestByThreeWayRequest.getConflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergeBranchesByThreeWayRequest.getConflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	CreateUnreferencedMergeCommitRequest.getConflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergeBranchesBySquashRequest.getConflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergePullRequestBySquashRequest.getConflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	ConflictResolution.withDeleteFiles(Collection<DeleteFileEntry> deleteFiles) Files that will be deleted as part of the merge conflict resolution.
ConflictResolution	ConflictResolution.withDeleteFiles(DeleteFileEntry... deleteFiles) Files that will be deleted 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.
ConflictResolution	ConflictResolution.withReplaceContents(ReplaceContentEntry... replaceContents) Files that will have content replaced as part of the merge conflict resolution.
ConflictResolution	ConflictResolution.withSetFileModes(Collection<SetFileModeEntry> setFileModes) File modes that will be set as part of the merge conflict resolution.
ConflictResolution	ConflictResolution.withSetFileModes(SetFileModeEntry... setFileModes) File modes that will be set as part of the merge conflict resolution.

Methods in com.amazonaws.services.codecommit.model with parameters of type ConflictResolution

Modifier and Type	Method and Description
void	MergePullRequestByThreeWayRequest.setConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
void	MergeBranchesByThreeWayRequest.setConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
void	CreateUnreferencedMergeCommitRequest.setConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
void	MergeBranchesBySquashRequest.setConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
void	MergePullRequestBySquashRequest.setConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergePullRequestByThreeWayRequest	MergePullRequestByThreeWayRequest.withConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergeBranchesByThreeWayRequest	MergeBranchesByThreeWayRequest.withConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
CreateUnreferencedMergeCommitRequest	CreateUnreferencedMergeCommitRequest.withConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergeBranchesBySquashRequest	MergeBranchesBySquashRequest.withConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergePullRequestBySquashRequest	MergePullRequestBySquashRequest.withConflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.