class Aws::CodeCommit::Types::DescribeMergeConflictsOutput
@!attribute [rw] conflict_metadata
Contains metadata about the conflicts found in the merge. @return [Types::ConflictMetadata]
@!attribute [rw] merge_hunks
A list of merge hunks of the differences between the files or lines. @return [Array<Types::MergeHunk>]
@!attribute [rw] next_token
An enumeration token that can be used in a request to return the next batch of the results. @return [String]
@!attribute [rw] destination_commit_id
The commit ID of the destination commit specifier that was used in the merge evaluation. @return [String]
@!attribute [rw] source_commit_id
The commit ID of the source commit specifier that was used in the merge evaluation. @return [String]
@!attribute [rw] base_commit_id
The commit ID of the merge base. @return [String]
@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/DescribeMergeConflictsOutput AWS API Documentation
Constants
- SENSITIVE