[#47253] - [5.4] Add workflow to mark conflicting PRs
- Fixed in Code Base
- 28 Feb 2026
- Medium
- Build: 5.4-dev
- # 47253
- Diff
- Hackwar:5.4-mergeconflicts
User tests: Successful: Unsuccessful:
- I read the Generative AI policy and my contribution is either not created with the help of AI or is compatible with the policy and GNU/GPL 2 or later.
Summary of Changes
We generally have an issue with PRs becoming stale and eventually developing conflicts. Unfortunately Github does not have an automatic filter for that, so this workflow is supposed to automatically mark PRs when they are conflicting.
Testing Instructions
Nothing to test.
Link to documentations
Please select:
-
Documentation link for guide.joomla.org:
-
No documentation changes for guide.joomla.org needed
-
Pull Request link for manual.joomla.org:
-
No documentation changes for manual.joomla.org needed
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Repository |
That should indeed happen automatically.
Sorry, rephrasing that: This should already be happening, as far as I understand the documentation of the action. We simply would have to merge this to see if it works.
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2026-02-28 14:13:32 |
| Closed_By | ⇒ | Hackwar | |
| Labels |
Added:
PR-5.4-dev
|
||
Can it be extended that when conflicts are solved, the label get removed?