Do not run pre-commit during merge

metaplex-foundation · Jul 2, 2024 · 3a8b45d · 3a8b45d
1 parent 5fea404
commit 3a8b45d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Exit if a merge is in progress
+if [ -f .git/MERGE_HEAD ]; then
+    exit 0
+fi
+
 set +e
 
 # Stash un-staged changes