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