class Aws::CodeCommit::Types::Conflict

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/Conflict AWS API Documentation
@return [Array<Types::MergeHunk>]
causing the conflict.
A list of hunks that contain the differences between files or lines
@!attribute [rw] merge_hunks
@return [Types::ConflictMetadata]
Metadata about a conflict in a merge operation.
@!attribute [rw] conflict_metadata
Information about conflicts in a merge operation.