From c645fd5ae58d1dda37a581c8e46999d4609fd6dd Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Fri, 15 May 2020 10:33:54 -0700 Subject: [PATCH] Better errors around branch deletion --- command/pr.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/command/pr.go b/command/pr.go index e5c72b166..21b850a67 100644 --- a/command/pr.go +++ b/command/pr.go @@ -558,7 +558,8 @@ func prMerge(cmd *cobra.Command, args []string) error { err = git.DeleteLocalBranch(pr.HeadRefName) if err != nil { - return err + fmt.Fprintf(colorableErr(cmd), "%s Could not deleted local branch %s: %s\n", utils.Red("!"), utils.Cyan(pr.HeadRefName), err) + return nil } fmt.Fprintf(colorableOut(cmd), "%s Deleted local branch %s\n", utils.Red("✔"), utils.Cyan(pr.HeadRefName)) }