Skip to content

fix: replace broken label-conflicts action with eps1lon/actions-label-merge-conflict #21704

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

Draft
bhimrazy wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Draft

fix: replace broken label-conflicts action with eps1lon/actions-label-merge-conflict #21704

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
10 changes: 5 additions & 5 deletions .github/workflows/label-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Label conflicts
on:
push:
branches: ["main"]
pull_request:
types: ["synchronize", "reopened", "opened"]
pull_request_target:
types: ["synchronize", "reopened", "opened"]

Expand All @@ -14,9 +16,7 @@ jobs:
triage-conflicts:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021
- uses: eps1lon/actions-label-merge-conflict@636b369ea34ff799b8db5182df6f19e39b2d4adb # v3.0.3
Copy link
Copy Markdown
Collaborator

@deependujha deependujha May 8, 2026

Choose a reason for hiding this comment

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

where did you get this commit hash from? I see commit hash to be: 1df065ebe6e3310545d4f4c4e862e43bdca146f0.

can you help me on this: https://github.com/eps1lon/actions-label-merge-conflict

Copy link
Copy Markdown
Collaborator Author

@bhimrazy bhimrazy May 8, 2026

Choose a reason for hiding this comment

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

mybad, I will change that to the 3.0.3

In the meantime, I was checking if the upstream repo accepts the fixes: mschilde/auto-label-merge-conflicts#67

with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 3
WAIT_MS: 5000
dirtyLabel: "has conflicts"
repoToken: ${{ secrets.GITHUB_TOKEN }}
Loading