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

Packages that use Conflict

Package	Description
com.amazonaws.services.codecommit.model

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

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

Modifier and Type	Method and Description
Conflict	Conflict.clone()
Conflict	Conflict.withConflictMetadata(ConflictMetadata conflictMetadata) Metadata about a conflict in a merge operation.
Conflict	Conflict.withMergeHunks(Collection<MergeHunk> mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.
Conflict	Conflict.withMergeHunks(MergeHunk... mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.

Methods in com.amazonaws.services.codecommit.model that return types with arguments of type Conflict

Modifier and Type	Method and Description
List<Conflict>	BatchDescribeMergeConflictsResult.getConflicts() A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

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

Modifier and Type	Method and Description
BatchDescribeMergeConflictsResult	BatchDescribeMergeConflictsResult.withConflicts(Conflict... conflicts) A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

Method parameters in com.amazonaws.services.codecommit.model with type arguments of type Conflict

Modifier and Type	Method and Description
void	BatchDescribeMergeConflictsResult.setConflicts(Collection<Conflict> conflicts) A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.
BatchDescribeMergeConflictsResult	BatchDescribeMergeConflictsResult.withConflicts(Collection<Conflict> conflicts) A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.