You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.
Class: Aws::CodeCommit::Types::MergeHunk
- Inherits:
-
Struct
- Object
- Struct
- Aws::CodeCommit::Types::MergeHunk
- Defined in:
- (unknown)
Overview
Information about merge hunks in a merge or pull request operation.
Instance Attribute Summary collapse
-
#base ⇒ Types::MergeHunkDetail
Information about the merge hunk in the base of a merge or pull request.
-
#destination ⇒ Types::MergeHunkDetail
Information about the merge hunk in the destination of a merge or pull request.
-
#is_conflict ⇒ Boolean
A Boolean value indicating whether a combination of hunks contains a conflict.
-
#source ⇒ Types::MergeHunkDetail
Information about the merge hunk in the source of a merge or pull request.
Instance Attribute Details
#base ⇒ Types::MergeHunkDetail
Information about the merge hunk in the base of a merge or pull request.
#destination ⇒ Types::MergeHunkDetail
Information about the merge hunk in the destination of a merge or pull request.
#is_conflict ⇒ Boolean
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.
#source ⇒ Types::MergeHunkDetail
Information about the merge hunk in the source of a merge or pull request.