| Safe Haskell | Safe-Inferred |
|---|---|
| Language | Haskell2010 |
Unison.Merge.CombineDiffs
Description
Combine two diffs together.
Synopsis
- data CombinedDiffOp a
- = CombinedDiffOp'Add !(EitherWayI a)
- | CombinedDiffOp'Delete !(EitherWayI a)
- | CombinedDiffOp'Update !(EitherWayI (Updated a))
- | CombinedDiffOp'Conflict !(TwoWay a)
- combineDiffs :: TwoWay (DefnsF3 (Map Name) DiffOp Synhashed Referent TypeReference) -> DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference
Documentation
data CombinedDiffOp a Source #
The combined result of two diffs on the same thing.
Constructors
| CombinedDiffOp'Add !(EitherWayI a) | |
| CombinedDiffOp'Delete !(EitherWayI a) | |
| CombinedDiffOp'Update !(EitherWayI (Updated a)) | |
| CombinedDiffOp'Conflict !(TwoWay a) |
Instances
| Functor CombinedDiffOp Source # | |
Defined in Unison.Merge.CombineDiffs Methods fmap :: (a -> b) -> CombinedDiffOp a -> CombinedDiffOp b # (<$) :: a -> CombinedDiffOp b -> CombinedDiffOp a # | |
| Show a => Show (CombinedDiffOp a) Source # | |
Defined in Unison.Merge.CombineDiffs Methods showsPrec :: Int -> CombinedDiffOp a -> ShowS # show :: CombinedDiffOp a -> String # showList :: [CombinedDiffOp a] -> ShowS # | |
combineDiffs :: TwoWay (DefnsF3 (Map Name) DiffOp Synhashed Referent TypeReference) -> DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference Source #
Combine LCA->Alice diff and LCA->Bob diff.