Skip to content

github: re-instate and update detect-conflicts workflow#24419

Open
tonycoz wants to merge 1 commit into
Perl:bleadfrom
tonycoz:detect-conflicts
Open

github: re-instate and update detect-conflicts workflow#24419
tonycoz wants to merge 1 commit into
Perl:bleadfrom
tonycoz:detect-conflicts

Conversation

@tonycoz
Copy link
Copy Markdown
Contributor

@tonycoz tonycoz commented May 11, 2026

This originally used a customized workflow at
https://github.com/atoomic/auto-label-merge-conflicts/tree/custom which included
mschilde/auto-label-merge-conflicts#43 which was merged in 2020.

Recently this custom version has been failing due to a bug that has been fixed upstream in
mschilde/auto-label-merge-conflicts#67

Unfortunately this workflow only runs on the blead branch, so we can only see if it works by merging it.


  • This set of changes does not require a perldelta entry.

This isn't a change to perl itself.

This originally used a customized workflow at
https://github.com/atoomic/auto-label-merge-conflicts/tree/custom
which included
mschilde/auto-label-merge-conflicts#43 which
was merged in 2020.

Recently this custom version has been failing due to a bug that has
been fixed upstream in
mschilde/auto-label-merge-conflicts#67

Unfortunately this workflow only runs on the blead branch, so we can
only see if it works by merging it.
@tonycoz tonycoz added the defer-next-dev This PR should not be merged yet, but await the next development cycle label May 12, 2026
@ap
Copy link
Copy Markdown
Contributor

ap commented May 18, 2026

This doesn’t affect the release at all, it doesn’t need to be deferred.

@tonycoz
Copy link
Copy Markdown
Contributor Author

tonycoz commented May 18, 2026

Yeah, I want to avoid noise at this point, especially since it's only active in the blead branch and noise was why it was removed (and hasn't had a review yet.)

I don't think it's critical to get in either.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

defer-next-dev This PR should not be merged yet, but await the next development cycle

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants