chore(tools): skip pre-commit hook during merge (#11281)

skip pre-commit hook during merge
artsy · Dec 12, 2024 · 2b8050f · 2b8050f
1 parent 01b0e2f
commit 2b8050f
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
 . "$(dirname "$0")/_/husky.sh"
 
+# Skip pre-commit during a merge
+if git rev-parse -q --verify MERGE_HEAD > /dev/null 2>&1; then
+    echo "Merge in progress; skipping pre-commit hook."
+    exit 0
+fi
 
 yarn lint-staged