From f7f183ef45f50b1370fa17d91031f50a04cc02cc Mon Sep 17 00:00:00 2001
From: Owen Stowe <ostowe@gmail.com>
Date: Wed, 30 Jun 2021 11:56:25 -0400
Subject: [PATCH] fix(release): lets try this AGAIN

---
 bin/reconcile-release | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/reconcile-release b/bin/reconcile-release
index 97155cf85b..cb8f1a2da0 100644
--- 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');
       }
     }