Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yaml
783 workflow runs
783 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix: trial synchronising SQLManager#sendBatch Label conflicting PRs #1437: Commit f8e9b32 pushed by dordsor21
6s fix/v7/synchronize-sendBatch
fix/v7/synchronize-sendBatch
6s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1436: Pull request #4735 synchronize by dordsor21
11s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
11s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1435: Pull request #4735 synchronize by dordsor21
9s
9s
Adjust to always check econ before merge Label conflicting PRs #1434: Commit 48a47be pushed by dordsor21
7s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
7s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1433: Pull request #4735 synchronize by dordsor21
7s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
7s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1432: Pull request #4735 synchronize by dordsor21
7s
7s
Adjust to always check econ before merge Label conflicting PRs #1431: Commit 683675b pushed by dordsor21
7s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
7s
fix: correct height that FAWE ends up using for schematics Label conflicting PRs #1430: Pull request #4736 synchronize by dordsor21
8s fix/v7/fawe-schematic-height
fix/v7/fawe-schematic-height
8s
fix: correct height that FAWE ends up using for schematics Label conflicting PRs #1429: Pull request #4736 synchronize by dordsor21
8s
8s
Further work Label conflicting PRs #1428: Commit f27300d pushed by dordsor21
7s fix/v7/fawe-schematic-height
fix/v7/fawe-schematic-height
7s
feat: implement better add/trust/deny/remove events Label conflicting PRs #1427: Pull request #4743 synchronize by dordsor21
10s feat/v7/better-add-trust-remove-deny-events
feat/v7/better-add-trust-remove-deny-events
10s
feat: implement better add/trust/deny/remove events Label conflicting PRs #1426: Pull request #4743 synchronize by dordsor21
7s
7s
feat: implement better add/trust/deny/remove events Label conflicting PRs #1425: Commit e2b6324 pushed by dordsor21
9s feat/v7/better-add-trust-remove-deny-events
feat/v7/better-add-trust-remove-deny-events
9s
Update worldedit to v7.3.18 Label conflicting PRs #1424: Commit 4e849c4 pushed by renovate bot
6s renovate/worldedit
renovate/worldedit
6s
Back to snapshot for development Label conflicting PRs #1423: Commit 8edc5c1 pushed by NotMyFault
2m 9s main
main
2m 9s
Release 7.5.11 Label conflicting PRs #1422: Commit 4fefe24 pushed by NotMyFault
7s 7.5.11
7.5.11
7s
Release 7.5.11 Label conflicting PRs #1421: Commit 4fefe24 pushed by NotMyFault
2m 9s main
main
2m 9s
Fix: (build) Defer shadowJar output access to fix exclusive lock issu… Label conflicting PRs #1420: Commit 8caa426 pushed by NotMyFault
2m 10s main
main
2m 10s
Update fawe to v2.14.3 (#4806) Label conflicting PRs #1419: Commit fce5566 pushed by renovate bot
2m 8s main
main
2m 8s
Update adventure to v4.26.1 (#4807) Label conflicting PRs #1418: Commit ab51b54 pushed by renovate bot
2m 9s main
main
2m 9s
Update adventure to v4.26.1 Label conflicting PRs #1417: Commit 6891e1f pushed by renovate bot
6s renovate/adventure
renovate/adventure
6s
Update fawe to v2.14.3 Label conflicting PRs #1416: Commit a953e8c pushed by renovate bot
7s renovate/fawe
renovate/fawe
7s
Fix: (build) Defer shadowJar output access to fix exclusive lock issue Label conflicting PRs #1415: Pull request #4805 synchronize by NotMyFault
11s LcyDev:fix
LcyDev:fix
11s
Fix: (build) Defer shadowJar output access to fix exclusive lock issue Label conflicting PRs #1414: Pull request #4805 synchronize by NotMyFault
7s
7s
fix: attempt to address unnecessary flight status changes (#4744) Label conflicting PRs #1413: Commit b4483ef pushed by NotMyFault
2m 8s main
main
2m 8s