From ffe506861bf4e5f3828baa6d5d996b660b7b2cfd Mon Sep 17 00:00:00 2001
From: Kishan P Rao <kishan.rao@saucelabs.com>
Date: Tue, 18 Aug 2026 15:30:50 +0200
Subject: [PATCH] husky: skip commit-msg prefix check for merge commits

---
 .husky/commit-msg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.husky/commit-msg b/.husky/commit-msg
index c967b00b2..7efcfe92d 100755
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1,3 +1,8 @@
 #!/usr/bin/env sh
+# Merge commits
+if git rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1; then
+    exit 0
+fi
+
 message="$(cat "$1")"
 node .husky/scripts/commit-msg.js "$message"