From 31ad7328805486d9bda05b9b507fa02335ef24b0 Mon Sep 17 00:00:00 2001
From: Jess <jess@jessicasachs.io>
Date: Wed, 12 Jan 2022 08:53:14 -0500
Subject: [PATCH] chore: do not exit when committing a merge (#96)

---
 scripts/verifyCommit.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/verifyCommit.ts b/scripts/verifyCommit.ts
index 2584cc37c76..65dd0b3d959 100644
--- a/scripts/verifyCommit.ts
+++ b/scripts/verifyCommit.ts
@@ -11,7 +11,9 @@ const releaseRE = /^v\d/;
 const commitRE =
   /^(revert: )?(feat|fix|docs|dx|refactor|perf|test|workflow|build|ci|chore|types|wip|release|deps)(\(.+\))?: .{1,50}/;
 
-if (!releaseRE.test(msg) && !commitRE.test(msg)) {
+const isMergeCommit = msg.startsWith('Merge remote-tracking-branch');
+
+if (!isMergeCommit && !releaseRE.test(msg) && !commitRE.test(msg)) {
   console.log();
   console.error(
     `  ${colors.bgRed(colors.white(' ERROR '))} ${colors.red(