fix merge

algolia · Jun 8, 2022 · f3d150d · f3d150d
1 parent f4304d9
commit f3d150d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scripts/ci/husky/pre-commit.js b/scripts/ci/husky/pre-commit.js
@@ -26,8 +26,12 @@ function getPatterns() {
 
 async function preCommit() {
   // when merging, we want to stage all the files
-  if ((await run('git merge HEAD')) !== 'Already up to date.') {
-    return;
+  try {
+    await run('git merge HEAD');
+  } catch (e) {
+    if (e.exitCode === 128) {
+      return;
+    }
   }
 
   const stagedFiles = (