From 4c576470a8075c4752ab67573bbc64eaab69265b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Wed, 19 Sep 2018 21:17:32 +0200 Subject: [PATCH] pull: don't stop the process when one merge fail --- commands/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/pull.go b/commands/pull.go index 5ad4acc3d258120bb6ad6961c7c6064f24222494..64dd83fed2a785ae6f3bdea651d746d09100626f 100644 --- a/commands/pull.go +++ b/commands/pull.go @@ -38,7 +38,7 @@ func runPull(cmd *cobra.Command, args []string) error { for merge := range backend.MergeAll(remote) { if merge.Err != nil { - return merge.Err + fmt.Println(merge.Err) } if merge.Status != bug.MergeStatusNothing {