Skip to content

github action: allow detect merge conflicts to fail #13465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

github action: allow detect merge conflicts to fail #13465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/detect-merge-conflicts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- master
- bugfix
- release/*

pull_request_target:
types: [synchronize]

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