chore: Release 3.4.6 [skip ci]

amannn · Oct 31, 2021 · 7bfb19c · 7bfb19c
1 parent f913d37
commit 7bfb19c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [3.4.6](https://github.com/amannn/action-semantic-pull-request/compare/v3.4.5...v3.4.6) (2021-10-31)
+
+
+### Bug Fixes
+
+* Better strategy to detect merge commits ([#132](https://github.com/amannn/action-semantic-pull-request/issues/132)) ([f913d37](https://github.com/amannn/action-semantic-pull-request/commit/f913d374b7bc698a5831a12c8955d1373c439548))
+
 ### [3.4.5](https://github.com/amannn/action-semantic-pull-request/compare/v3.4.4...v3.4.5) (2021-10-28)
 
 

diff --git a/dist/index.js b/dist/index.js
@@ -33354,7 +33354,7 @@ module.exports = async function run() {
             // GitHub does not count merge commits when deciding whether to use
             // the PR title or a commit message for the squash commit message.
             nonMergeCommits = commits.filter(
-              (commit) => !commit.commit.message.startsWith('Merge branch')
+              (commit) => commit.parents.length < 2
             );
 
             // We only need two non-merge commits to know that the PR