From 2b8050fafe69c7a3aa2e88e3810ad336a9be8c93 Mon Sep 17 00:00:00 2001
From: Brian Beckerle <49686530+brainbicycle@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:12:14 -0500
Subject: [PATCH] chore(tools): skip pre-commit hook during merge (#11281)

skip pre-commit hook during merge
---
 .husky/pre-commit | 5 +++++
 1 file changed, 5 insertions(+)

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