diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/verifyCommit.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/verifyCommit.ts b/scripts/verifyCommit.ts index 2584cc37..65dd0b3d 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( |