| Safe Haskell | None |
|---|---|
| Language | Haskell2010 |
Darcs.Patch.V1.Commute
- merge :: Merge p => (p :\/: p) wX wY -> (p :/\: p) wX wY
- merger :: PrimPatch prim => String -> Patch prim wX wY -> Patch prim wX wZ -> Sealed (Patch prim wY)
- unravel :: PrimPatch prim => Patch prim wX wY -> [Sealed (FL prim wX)]
- publicUnravel :: PrimPatch prim => Patch prim wX wY -> [Sealed (FL prim wY)]
Documentation
merger :: PrimPatch prim => String -> Patch prim wX wY -> Patch prim wX wZ -> Sealed (Patch prim wY) Source
merger takes two patches, (which have been determined to conflict) and
constructs a Merger patch to represent the conflict. p1 is considered to
be conflicting with p2 (p1 is the "first" patch in the repo ordering),
the resulting Merger is therefore a representation of p2.