diff options
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index bbe6a98b3..11ea30a52 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -196,11 +196,13 @@ mergeFrom branch = do resolveMerge :: Annex Bool resolveMerge = do top <- fromRepo Git.repoPath - merged <- all id <$> (mapM resolveMerge' =<< inRepo (LsFiles.unmerged [top])) + (fs, cleanup) <- inRepo (LsFiles.unmerged [top]) + merged <- all id <$> mapM resolveMerge' fs when merged $ do Annex.Queue.flush void $ inRepo $ Git.Command.runBool "commit" [Param "-m", Param "git-annex automatic merge conflict fix"] + void $ liftIO cleanup return merged resolveMerge' :: LsFiles.Unmerged -> Annex Bool |