Skip to content

Commit 2d24ebb

Browse files
committed
Ignore failures to update PRs
1 parent 1b2f334 commit 2d24ebb

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/autoupdate.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ jobs:
1515
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1616
PR_FILTER: "protected"
1717
MERGE_MSG: "Auto-update feature branch with changes from the main branch"
18+
MERGE_CONFLICT_ACTION: "ignore"

0 commit comments

Comments
 (0)