Copyright	(c) 2013-2021 Brendan Hay
License	Mozilla Public License, v. 2.0.
Maintainer	Brendan Hay <brendan.g.hay+amazonka@gmail.com>
Stability	auto-generated
Portability	non-portable (GHC extensions)
Safe Haskell	None

Amazonka.CodeCommit.Types.Conflict

Description

Synopsis

data Conflict = Conflict' {
- mergeHunks :: Maybe [MergeHunk]
- conflictMetadata :: Maybe ConflictMetadata
}
newConflict :: Conflict
conflict_mergeHunks :: Lens' Conflict (Maybe [MergeHunk])
conflict_conflictMetadata :: Lens' Conflict (Maybe ConflictMetadata)

Documentation

data Conflict Source #

Information about conflicts in a merge operation.

See: newConflict smart constructor.

Constructors

Conflict'
Fields mergeHunks :: Maybe [MergeHunk] A list of hunks that contain the differences between files or lines causing the conflict. conflictMetadata :: Maybe ConflictMetadata Metadata about a conflict in a merge operation.

Instances

Instances details

Eq Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods (==) :: Conflict -> Conflict -> Bool # (/=) :: Conflict -> Conflict -> Bool #
Read Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods readsPrec :: Int -> ReadS Conflict # readList :: ReadS [Conflict] # readPrec :: ReadPrec Conflict # readListPrec :: ReadPrec [Conflict] #
Show Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods showsPrec :: Int -> Conflict -> ShowS # show :: Conflict -> String # showList :: [Conflict] -> ShowS #
Generic Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Associated Types type Rep Conflict :: Type -> Type # Methods from :: Conflict -> Rep Conflict x # to :: Rep Conflict x -> Conflict #
NFData Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods rnf :: Conflict -> () #
Hashable Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods hashWithSalt :: Int -> Conflict -> Int # hash :: Conflict -> Int #
FromJSON Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods parseJSON :: Value -> Parser Conflict # parseJSONList :: Value -> Parser [Conflict] #
type Rep Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict type Rep Conflict = D1 ('MetaData "Conflict" "Amazonka.CodeCommit.Types.Conflict" "libZSservicesZSamazonka-codecommitZSamazonka-codecommit" 'False) (C1 ('MetaCons "Conflict'" 'PrefixI 'True) (S1 ('MetaSel ('Just "mergeHunks") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe [MergeHunk])) :*: S1 ('MetaSel ('Just "conflictMetadata") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictMetadata))))

newConflict :: Conflict Source #

Create a value of Conflict with all optional fields omitted.

Use generic-lens or optics to modify other optional fields.

The following record fields are available, with the corresponding lenses provided for backwards compatibility:

$sel:mergeHunks:Conflict', conflict_mergeHunks - A list of hunks that contain the differences between files or lines causing the conflict.

$sel:conflictMetadata:Conflict', conflict_conflictMetadata - Metadata about a conflict in a merge operation.

conflict_mergeHunks :: Lens' Conflict (Maybe [MergeHunk]) Source #

A list of hunks that contain the differences between files or lines causing the conflict.

conflict_conflictMetadata :: Lens' Conflict (Maybe ConflictMetadata) Source #

Metadata about a conflict in a merge operation.