diff --git a/.husky/pre-commit b/.husky/pre-commit
index 73d0fbd5df3..0fbc1d298c1 100755
--- 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