From 88f9bb40f75d3620d502277ab7006c44fe3260b1 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Thu, 5 Oct 2017 10:45:08 +0200
Subject: [PATCH] fix: downgrade github branch merge api error to warn (#889)
---
lib/api/github.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/api/github.js b/lib/api/github.js
index 4a1a190bbd..b1e74e1c0d 100644
--- a/lib/api/github.js
+++ b/lib/api/github.js
@@ -392,7 +392,7 @@ async function mergeBranch(branchName, mergeType) {
try {
await ghGotRetry.patch(url, options);
} 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');
}
} else if (mergeType === 'branch-merge-commit') {
@@ -406,7 +406,7 @@ async function mergeBranch(branchName, mergeType) {
try {
await ghGotRetry.post(url, options);
} 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');
}
} else {
--
GitLab