Skip to content

Commit 33f9b5c

Browse files
ramsessanchezclaude
andcommitted
Enable merge groups for conflicting-pr-label workflow
Adds merge_group trigger to the conflicting-pr-label workflow to enable automatic merge group handling, consistent with other CI workflows in this repository (codeql-analysis, gradle-build, sonarcloud, api-level-lint). This change eliminates the need to manually rebase PRs when using merge queues. Adapted from microsoft/kiota#6952 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent fc576b0 commit 33f9b5c

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.github/workflows/conflicting-pr-label.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
pull_request:
1212
types: [synchronize]
1313
branches: [main, support/2.x.x]
14+
merge_group:
1415

1516
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1617
jobs:

0 commit comments

Comments
 (0)