Merging master into branch: feat1

Nordstrom · Dec 15, 2016 · 9785010 · 9785010
2 parents 05aeab6 + 2295bdd
commit 9785010
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/github.js b/src/github.js
@@ -91,11 +91,7 @@ function mergeToMaster(repo, branch) {
             return Promise.resolve();
         })
         .catch(function (err) {
-            if (err.message.message.indexOf("409")) {
-                return Promise.reject("Conflict merging " + branch + "into master");
-            } else {
-                return Promise.reject(err.message);
-            }
+            return Promise.reject(err.message);
         })
 }
 
@@ -143,11 +139,7 @@ function preCheck(repo, branch) {
             return Promise.resolve();
         })
         .catch(function(err){
-            if (err.message.message.indexOf("409") > -1){
-                return Promise.reject("Conflict merging master into " + branch);
-            } else {
-                return Promise.reject(err.message);
-            }
+            return Promise.reject(err.message);
         })
 }