class Aws::CodeCommit::Types::MergeHunk

Information about merge hunks in a merge or pull request operation.

@!attribute [rw] is_conflict

A Boolean value indicating whether a combination of hunks contains a
conflict. Conflicts occur when the same file or the same lines in a
file were modified in both the source and destination of a merge or
pull request. Valid values include true, false, and null. True when
the hunk represents a conflict and one or more files contains a line
conflict. File mode conflicts in a merge do not set this to true.
@return [Boolean]

@!attribute [rw] source

Information about the merge hunk in the source of a merge or pull
request.
@return [Types::MergeHunkDetail]

@!attribute [rw] destination

Information about the merge hunk in the destination of a merge or
pull request.
@return [Types::MergeHunkDetail]

@!attribute [rw] base

Information about the merge hunk in the base of a merge or pull
request.
@return [Types::MergeHunkDetail]

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergeHunk AWS API Documentation

Constants

SENSITIVE