Copyright	(c) 2013-2023 Brendan Hay
License	Mozilla Public License, v. 2.0.
Maintainer	Brendan Hay
Stability	auto-generated
Portability	non-portable (GHC extensions)
Safe Haskell	Safe-Inferred
Language	Haskell2010

Amazonka.CodeCommit.Types.Conflict

Description

Synopsis

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

Documentation

data Conflict Source #

Information about conflicts in a merge operation.

See: newConflict smart constructor.

Constructors

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

Instances

Instances details

FromJSON Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods parseJSON :: Value -> Parser Conflict # parseJSONList :: Value -> Parser [Conflict] #
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 #
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 #
NFData Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods rnf :: Conflict -> () #
Eq Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods (==) :: Conflict -> Conflict -> Bool # (/=) :: Conflict -> Conflict -> Bool #
Hashable Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict Methods hashWithSalt :: Int -> Conflict -> Int # hash :: Conflict -> Int #
type Rep Conflict Source #
Instance details Defined in Amazonka.CodeCommit.Types.Conflict type Rep Conflict = D1 ('MetaData "Conflict" "Amazonka.CodeCommit.Types.Conflict" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "Conflict'" 'PrefixI 'True) (S1 ('MetaSel ('Just "conflictMetadata") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictMetadata)) :*: S1 ('MetaSel ('Just "mergeHunks") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe [MergeHunk]))))

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:conflictMetadata:Conflict', conflict_conflictMetadata - Metadata about a conflict in a merge operation.

$sel:mergeHunks:Conflict', conflict_mergeHunks - 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.

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

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