fix(release): lets try this AGAIN

alleyinteractive · Jun 30, 2021 · f7f183e · f7f183e
1 parent e7af8a3
commit f7f183e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bin/reconcile-release b/bin/reconcile-release
@@ -37,8 +37,9 @@ inquirer
     try {
       execSync(`git merge ${releaseBranch}`).toString('utf8');
     } catch (e) {
-      console.log(e);
-      if (e.message.includes('Automatic merge failed')) {
+      const message = e.stderr.toString('utf8');
+      console.log(message);
+      if (message.includes('Automatic merge failed')) {
         console.log('HELLO I AM CONFLICTED');
       }
     }