squash: skip merge commits

open-telemetry · Jan 10, 2024 · 4f592bb · 4f592bb
1 parent 9e8b19f
commit 4f592bb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/workflows/conventional-commits.yaml b/.github/workflows/conventional-commits.yaml
@@ -13,8 +13,8 @@ on:
       - edited
 
 permissions:
-  contents: write
-  pull-requests: write
+  contents: read
+  pull-requests: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}  # Ensure that only one instance of this workflow is running per Pull Request
@@ -36,6 +36,7 @@ jobs:
             docs
             feat
             fix
+            merge
             perf
             refactor
             release