Skip to content

Actions: joomla/joomla-cms

Actions

Detect merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
243 workflow runs
243 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[5.4] Fix relative asset paths on Cassiopeia error page Detect merge conflicts #243: Pull request #47251 synchronize by krishnagandhicode
13s
13s
Remove exceptions from phpstan and cleanup baseline file Detect merge conflicts #242: Commit 50dbb47 pushed by Hackwar
17s 6.1-phpstan
6.1-phpstan
17s
[5.4][AI] GH Actions workflow - mandatory pr checkboxes Detect merge conflicts #241: Pull request #47365 synchronize by LadySolveig
9s
9s
[6.1] Default new user's assigned group to active group filter Detect merge conflicts #240: Pull request #47366 synchronize by krishnagandhicode
8s
8s
[5.4][AI] GH Actions workflow - mandatory pr checkboxes Detect merge conflicts #239: Pull request #47365 synchronize by LadySolveig
11s
11s
[5.4][AI] GH Actions workflow - mandatory pr checkboxes Detect merge conflicts #238: Pull request #47365 synchronize by LadySolveig
12s
12s
[5.4][AI] GH Actions workflow - mandatory pr checkboxes Detect merge conflicts #237: Pull request #47365 synchronize by LadySolveig
10s
10s
[5.4] Fix relative asset paths on Cassiopeia error page Detect merge conflicts #236: Pull request #47251 synchronize by muhme
9s
9s
[5.4] Fix undefined array key warnings in workflow permissionns (#46933) Detect merge conflicts #235: Commit a280811 pushed by muhme
2m 11s 5.4-dev
5.4-dev
2m 11s
[5.4] fix undefined array key warnings in workflow permissionns Detect merge conflicts #234: Pull request #46933 synchronize by muhme
11s
11s
[5.4] Reset selector filters when clearing SearchTools filters (#47352) Detect merge conflicts #233: Commit d2bce5b pushed by muhme
2m 9s 5.4-dev
5.4-dev
2m 9s
[6.0] route deprecation (#47347) Detect merge conflicts #232: Commit 08af197 pushed by softforge
2m 8s 6.0-dev
6.0-dev
2m 8s
[6.0] route deprecation Detect merge conflicts #231: Pull request #47347 synchronize by softforge
11s
11s
[6.0] Toolbar Deprecations (#47346) Detect merge conflicts #230: Commit acf4291 pushed by softforge
2m 10s 6.0-dev
6.0-dev
2m 10s
[5.4] Reset selector filters when clearing SearchTools filters Detect merge conflicts #229: Pull request #47352 synchronize by richard67
10s
10s
[6.0] Toolbar Deprecations Detect merge conflicts #228: Pull request #47346 synchronize by softforge
11s
11s
[6.0] HTMLHelper deprecation message (#47345) Detect merge conflicts #227: Commit 2b523f1 pushed by softforge
2m 10s 6.0-dev
6.0-dev
2m 10s
[6.0] HTMLHelper deprecation message Detect merge conflicts #226: Pull request #47345 synchronize by Bodge-IT
9s
9s
[6.1] Fix SQL error "Duplicate entry '14' for key '#__content_types.PRIMARY'" when updating to 6.1 Detect merge conflicts #225: Pull request #47361 synchronize by richard67
12s
12s
[5.4] Check if schema path exists in manifest (#47336) Detect merge conflicts #224: Commit 02907a1 pushed by muhme
2m 8s 5.4-dev
5.4-dev
2m 8s
[6.0] Upmerges - 2026-03-10 Detect merge conflicts #223: Commit c434b27 pushed by Bodge-IT
2m 9s 6.0-dev
6.0-dev
2m 9s
[6.0] Upmerges - 2026-03-10 Detect merge conflicts #222: Pull request #47349 synchronize by Bodge-IT
12s
12s
[7.0] A11y drag and drop Detect merge conflicts #221: Pull request #47328 synchronize by dgrammatiko
12s
12s
[7.0] Remove deprecated component code Detect merge conflicts #220: Pull request #45858 synchronize by Hackwar
11s
11s
[7.0] A11y drag and drop Detect merge conflicts #219: Pull request #47328 synchronize by dgrammatiko
10s
10s