Skip to content

Commit f3adb6c

Browse files
authored
Change merge conflict bot trigger branch to main
Updated the merge conflict bot workflow to trigger on the main branch instead of 'merge-conflict-bot-main-trigger'. Signed-off-by: cheese-cakee <farzanaman99@gmail.com>
1 parent 0ffe6db commit f3adb6c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.github/workflows/merge-conflict-bot.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
push:
77
branches:
88
- main
9-
- 'merge-conflict-bot-main-trigger'
109

1110
permissions:
1211
contents: read
@@ -91,7 +90,7 @@ jobs:
9190
if (context.eventName === 'push') {
9291
console.log("Triggered by Push to Main. Fetching all open PRs...");
9392
const { data: openPrs } = await github.rest.pulls.list({
94-
owner, repo, state: 'open', base: 'merge-conflict-bot-main-trigger'
93+
owner, repo, state: 'open', base: 'main'
9594
});
9695
prsToCheck = openPrs.map(pr => pr.number);
9796
}

0 commit comments

Comments
 (0)