fix: fix commit validation after a merge

Author: carlh98

build/templates/validate-commits.yaml

@@ -24,7 +24,7 @@ steps:
         Write-Host "Commits found: $commitCount"
 
         # Regex pattern for Conventional Commits
-        $pattern = '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\.\-]+\))?(!)?: ([\w ])+([\s\S]*)|^(Merged PR \d+: .+)|^(Merge pull request #/d+ from .+)'
+        $pattern = '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\.\-]+\))?(!)?: ([\w ])+([\s\S]*)|^(Merged PR \d+: .+)|^(Merge pull request #\d+ from .+)|^(Merge branch .+)'
         Write-Host "Regular Expression: $pattern"
 
         # Validate each commit message

src/cli/CHANGELOG.md

@@ -7,6 +7,7 @@ Prefix your items with `(Template)` if the change is about the template and not
 
 ## 0.24.3
 - Update CLI documentation.
+- Fix commit validation after a merge.
 
 ## 0.24.2
 - General improvements, including sample documentation (see `src/cli/example/README.md`).