chore: do not exit when committing a merge (#96)

faker-js · Jan 12, 2022 · 31ad732 · 31ad732
1 parent 2fafe7b
commit 31ad732
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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(