fix(github): ignore branch deletion error if branch is already deleted (

#189)
lindell · Sep 29, 2021 · d63d041 · d63d041
1 parent 633a2cc
commit d63d041
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/internal/scm/github/github.go b/internal/scm/github/github.go
@@ -334,7 +334,13 @@ func (g Github) MergePullRequest(ctx context.Context, pullReq git.PullRequest) e
 	}
 
 	_, err = g.ghClient.Git.DeleteRef(ctx, pr.prOwnerName, pr.prRepoName, fmt.Sprintf("heads/%s", pr.branchName))
-	return err
+
+	// Ignore errors about the reference not existing since it may be the case that GitHub has already deleted the branch
+	if err != nil && !strings.Contains(err.Error(), "Reference does not exist") {
+		return err
+	}
+
+	return nil
 }
 
 // ClosePullRequest closes a pull request