Skip to content

Commit ffe5167

Browse files
github action: allow detect merge conflicts to fail (#13465)
1 parent 8a9a3da commit ffe5167

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/detect-merge-conflicts.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- master
88
- bugfix
99
- release/*
10-
10+
1111
pull_request_target:
1212
types: [synchronize]
1313

@@ -16,6 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: check if prs are conflicted
19+
# we experience a high error rate so we allow this to fail but still have the check become green on the PR
20+
continue-on-error: true
1921
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
2022
with:
2123
dirtyLabel: "conflicts-detected"

0 commit comments

Comments
 (0)