StoneCypher / jssm / 5ce3dc741c42ab2e88f4cedf00bec0b43e470a7d

100%

master: 100%

Pull #973

github

ci(commitlint): exempt hand-titled merge subjects, matching the config's stated intent

The config already says merge commits are exempt, but commitlint's default ignores only match git's own wording -- 'Merge pull request', 'Merge branch', 'Merge remote-tracking'. A house-style merge titled 'merge: main 5.163.4 up into the 6.0.0-alpha integration line' instead parses as a Conventional Commit whose type is 'merge', which is not in the enum, so it failed the very rule merges are supposed to be exempt from. fdb7aeeb (2026-07-18) is a real two-parent merge commit that tripped this.

Rewriting the message would need a force-push over 285 commits of shared history and would fix only that one commit -- the next hand-titled merge would fail identically. The ignore is deliberately narrow: only a leading 'merge:' token, so a commit that merely mentions merging is still linted.

Also folds in the post-merge rebuild of dist, changelog and readme.

3869 of 3869 branches covered (100.0%)

Branch coverage included in aggregate %.

6361 of 6361 relevant lines covered (100.0%)

33378.97 hits per line