Merge pull request #5701 from unisonweb/cp/honest-merge

Author: aryairani

unison-cli/src/Unison/Codebase/Editor/HandleInput/Pull.hs

@@ -87,8 +87,6 @@ handlePull unresolvedSourceAndTarget pullMode = do
           void $ Cli.updateAtM description targetProjectPath (const $ pure remoteBranchObject)
           Cli.respond $ MergeOverEmpty target
         else do
-          Cli.respond AboutToMerge
-
           let aliceCausalHash = Branch.headHash targetBranch
           lcaCausalHash <- Cli.runTransaction (Operations.lca aliceCausalHash remoteCausalHash)
 

unison-cli/src/Unison/Codebase/Editor/Output.hs

@@ -308,7 +308,6 @@ data Output
   | PullSuccessful
       (ReadRemoteNamespace Share.RemoteProjectBranch)
       (ProjectAndBranch Sqlite.Project Sqlite.ProjectBranch)
-  | AboutToMerge
   | -- | Indicates a trivial merge where the destination was empty and was just replaced.
     MergeOverEmpty (ProjectAndBranch Sqlite.Project Sqlite.ProjectBranch)
   | MergeAlreadyUpToDate2 !MergeSourceAndTarget
@@ -584,7 +583,6 @@ isFailure o = case o of
   NoBranchWithHash {} -> True
   PullAlreadyUpToDate {} -> False
   PullSuccessful {} -> False
-  AboutToMerge {} -> False
   MergeOverEmpty {} -> False
   MergeAlreadyUpToDate2 {} -> False
   ListShallow _ es -> null es

unison-cli/src/Unison/CommandLine/OutputMessages.hs

@@ -1191,7 +1191,6 @@ notifyUser dir = \case
           <> prettyProjectAndBranchName (ProjectAndBranch dest.project.name dest.branch.name)
           <> "from"
           <> P.group (prettyReadRemoteNamespace ns <> ".")
-  AboutToMerge -> pure "Merging..."
   MergeOverEmpty dest ->
     pure . P.okCallout $
       P.wrap $