Skip to content

👷 Detect and label merge conflicts on PRs automatically #1286

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 3 commits into from
Sep 1, 2025
Merged

👷 Detect and label merge conflicts on PRs automatically #1286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ddc65
create conflict yml
svlandeg Sep 1, 2025
d5be714
empty line
svlandeg Sep 1, 2025
3462178
typo
svlandeg Sep 1, 2025
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
16 changes: 16 additions & 0 deletions .github/workflows/conflict.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Conflict detector"
on:
push:
pull_request_target:
types: [synchronize]

jobs:
main:
runs-on: ubuntu-latest
steps:
- name: Check if PRs have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also remove this line, then no comment will be posted, only the label will be added.
I think posting a comment will be helpful though, both for the original poster as well as for maintainers who have worked on the PR and are subscribed to it.

Loading