| Safe Haskell | None |
|---|---|
| Language | Haskell2010 |
Unison.Merge.PartitionCombinedDiffs
Synopsis
- partitionCombinedDiffs :: TwoWay (Defns (BiMultimap Referent Name) (BiMultimap TypeReference Name)) -> TwoWay DeclNameLookup -> DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference -> (TwoWay (DefnsF (Map Name) TermReference TypeReference), DefnsF Unconflicts Referent TypeReference)
- narrowConflictsToNonBuiltins :: TwoWay (DefnsF (Map Name) TermReference TypeReference) -> Either (Defn Name Name) (TwoWay (DefnsF (Map Name) TermReferenceId TypeReferenceId))
- assumeUnconflicts :: DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference -> DefnsF Unconflicts Referent TypeReference
Documentation
partitionCombinedDiffs :: TwoWay (Defns (BiMultimap Referent Name) (BiMultimap TypeReference Name)) -> TwoWay DeclNameLookup -> DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference -> (TwoWay (DefnsF (Map Name) TermReference TypeReference), DefnsF Unconflicts Referent TypeReference) Source #
Combine LCA->Alice diff and LCA->Bob diff, then partition into conflicted and unconflicted things.