diff options
| author | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:17:32 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:45:52 +0200 |
| commit | 4c576470a8075c4752ab67573bbc64eaab69265b (patch) | |
| tree | f6b825b8ee1ec4f48e8145a27a91a0663754d08d /commands/pull.go | |
| parent | 63d0b8b72f4bfcf24a393a377288654440d0807d (diff) | |
| download | git-bug-4c576470a8075c4752ab67573bbc64eaab69265b.tar.gz | |
pull: don't stop the process when one merge fail
Diffstat (limited to 'commands/pull.go')
| -rw-r--r-- | commands/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/pull.go b/commands/pull.go index 5ad4acc3..64dd83fe 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 { |