fix(misc): Replace abandoned merge-conflict label action

[bakerboy448]

Problem

The triage job (.github/workflows/conflicts.yml) fails on every push and PR. mschilde/auto-label-merge-conflicts builds a Docker image whose Dockerfile runs yarn install --frozen-lockfile on node:alpine, which no longer ships yarn:

/bin/sh: yarn: not found
ERROR: process "/bin/sh -c yarn install --frozen-lockfile" did not complete successfully: exit code: 127

The action is unmaintained, so this won't be fixed upstream.

Fix

Replace it with the maintained eps1lon/actions-label-merge-conflict@v3.1.0 (a node24 JS action — no Docker, no yarn). Inputs mapped 1:1:

old	new
CONFLICT_LABEL_NAME	dirtyLabel
GITHUB_TOKEN	repoToken
MAX_RETRIES	retryMax
WAIT_MS: 5000 (ms)	retryAfter: 5 (sec)

Also added continueOnMissingPermissions: true so PRs from forks (which only get a read-only token) don't fail the check.

Pinned to SHA e0e7fd9 with a version comment, matching the repo's pinning convention.

Summary by Sourcery

CI:

• Update the merge-conflict triage workflow to use eps1lon/actions-label-merge-conflict with equivalent settings and support for missing permissions on forked PRs.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Replaces the failing, abandoned merge-conflict labeling GitHub Action with a maintained alternative and updates workflow inputs and permissions handling accordingly.

Flow diagram for the updated merge-conflict labeling GitHub Action

flowchart TD
  GitHubEvent[GitHub push/PR event]
  Workflow[triage workflow conflicts.yml]
  Step[Label merge conflicts\n eps1lon/actions-label-merge-conflict]
  Perm{Has write permissions?}
  Conflict{Merge conflicts detected?}
  Label[Apply dirtyLabel\n Status: Conflicted]
  Success[Job succeeds]

  GitHubEvent --> Workflow
  Workflow --> Step
  Step --> Perm
  Perm -- Yes --> Conflict
  Perm -- No --> Success
  Conflict -- Yes --> Label
  Conflict -- No --> Success
  Label --> Success

Loading

File-Level Changes

Change	Details	Files
Swap out the unmaintained Docker-based merge-conflict labeling action for a maintained Node-based one and remap its configuration.	Replaces mschilde/auto-label-merge-conflicts@5981f89 with eps1lon/actions-label-merge-conflict@e0e7fd9, pinned with a version comment. Updates action inputs to the new action’s schema, mapping conflict label name, repo token, retry count, and retry delay from milliseconds to seconds. Adds continueOnMissingPermissions: true so triage checks don’t fail on PRs from forks with read-only tokens.	.github/workflows/conflicts.yml

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[bakerboy448]

Closing as superseded — master already fixed this via #2748 (switch to eps1lon/actions-label-merge-conflict + fix fork-PR failures) and #2757 (bump to v3.1.0). Master's version additionally moves to pull_request_target (write-capable token, with a 'never checks out PR code' safety note), which is a cleaner fix than the continueOnMissingPermissions approach here. No changes needed.