unison-cli-0.0.0

Safe Haskell	Safe-Inferred
Language	Haskell2010

Unison.Codebase.Editor.HandleInput.Merge2

Contents

API exported for pull
API exported for todo

Description

merge input handler.

Synopsis

handleMerge :: ProjectAndBranch (Maybe ProjectName) ProjectBranchName -> Cli ()
data MergeInfo = MergeInfo {
- alice :: !AliceMergeInfo
- bob :: !BobMergeInfo
- lca :: !LcaMergeInfo
- description :: !Text
}
data AliceMergeInfo = AliceMergeInfo {
- causalHash :: !CausalHash
- projectAndBranch :: !(ProjectAndBranch Project ProjectBranch)
}
data BobMergeInfo = BobMergeInfo {
- causalHash :: !CausalHash
- source :: !MergeSource
}
newtype LcaMergeInfo = LcaMergeInfo {
- causalHash :: Maybe CausalHash
}
doMerge :: MergeInfo -> Cli ()
doMergeLocalBranch :: TwoWay (ProjectAndBranch Project ProjectBranch) -> Cli ()
hasDefnsInLib :: Applicative m => Branch m -> m Bool

Documentation

handleMerge :: ProjectAndBranch (Maybe ProjectName) ProjectBranchName -> Cli () Source #

API exported for `pull`

data MergeInfo Source #

Constructors

MergeInfo
Fields alice :: !AliceMergeInfo bob :: !BobMergeInfo lca :: !LcaMergeInfo description :: !Text How should we describe this merge in the reflog?

data AliceMergeInfo Source #

Constructors

AliceMergeInfo
Fields causalHash :: !CausalHash projectAndBranch :: !(ProjectAndBranch Project ProjectBranch)

data BobMergeInfo Source #

Constructors

BobMergeInfo
Fields causalHash :: !CausalHash source :: !MergeSource

newtype LcaMergeInfo Source #

Constructors

LcaMergeInfo
Fields causalHash :: Maybe CausalHash

doMerge :: MergeInfo -> Cli () Source #

doMergeLocalBranch :: TwoWay (ProjectAndBranch Project ProjectBranch) -> Cli () Source #

API exported for `todo`

hasDefnsInLib :: Applicative m => Branch m -> m Bool Source #