Skip to content
Snippets Groups Projects
Commit 88f9bb40 authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix: downgrade github branch merge api error to warn (#889)

parent d4d5b40e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
lib/api/github.js
+ 2
− 2
View file @ 88f9bb40
...@@ -392,7 +392,7 @@ async function mergeBranch(branchName, mergeType) { ...@@ -392,7 +392,7 @@ async function mergeBranch(branchName, mergeType) {
try { try {
await ghGotRetry.patch(url, options); await ghGotRetry.patch(url, options);
} catch (err) { } catch (err) {
logger.error({ err }, `Error pushing branch merge for ${branchName}`); logger.warn({ err }, `Error pushing branch merge for ${branchName}`);
throw new Error('branch-push failed'); throw new Error('branch-push failed');
} }
} else if (mergeType === 'branch-merge-commit') { } else if (mergeType === 'branch-merge-commit') {
...@@ -406,7 +406,7 @@ async function mergeBranch(branchName, mergeType) { ...@@ -406,7 +406,7 @@ async function mergeBranch(branchName, mergeType) {
try { try {
await ghGotRetry.post(url, options); await ghGotRetry.post(url, options);
} catch (err) { } catch (err) {
logger.error({ err }, `Error pushing branch merge for ${branchName}`); logger.warn({ err }, `Error pushing branch merge for ${branchName}`);
throw new Error('branch-merge-commit failed'); throw new Error('branch-merge-commit failed');
} }
} else { } else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment