Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update actions/checkout action to v6 Label conflicting PRs #1399: Commit 97ec0de pushed by renovate bot
9s renovate/actions-checkout-6.x
renovate/actions-checkout-6.x
9s
Update fawe to v2.14.2 Label conflicting PRs #1398: Commit 9c979a6 pushed by renovate bot
7s renovate/fawe
renovate/fawe
7s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1397: Pull request #4735 synchronize by dordsor21
4m 5s
4m 5s
fix: fix a specific situation where a merge can fail but take money still Label conflicting PRs #1396: Pull request #4735 synchronize by dordsor21
3m 53s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
3m 53s
fix: fix a specific situation where a merge can fail but take money s… Label conflicting PRs #1395: Commit f4a24c5 pushed by dordsor21
3m 49s fix/v7/specific-merge-fail
fix/v7/specific-merge-fail
3m 49s
fix: correct height that FAWE ends up using for schematics Label conflicting PRs #1394: Pull request #4736 synchronize by dordsor21
4m 7s fix/v7/fawe-schematic-height
fix/v7/fawe-schematic-height
4m 7s
fix: correct height that FAWE ends up using for schematics Label conflicting PRs #1393: Pull request #4736 synchronize by dordsor21
4m 5s
4m 5s
Further work Label conflicting PRs #1392: Commit 2fff573 pushed by dordsor21
3m 43s fix/v7/fawe-schematic-height
fix/v7/fawe-schematic-height
3m 43s
feat: implement better add/trust/deny/remove events Label conflicting PRs #1391: Pull request #4743 synchronize by dordsor21
3m 30s
3m 30s
feat: implement better add/trust/deny/remove events Label conflicting PRs #1390: Pull request #4743 synchronize by dordsor21
3m 17s feat/v7/better-add-trust-remove-deny-events
feat/v7/better-add-trust-remove-deny-events
3m 17s
Merge branch 'main' into feat/v7/better-add-trust-remove-deny-events Label conflicting PRs #1389: Commit 0626ba9 pushed by dordsor21
3m 31s feat/v7/better-add-trust-remove-deny-events
feat/v7/better-add-trust-remove-deny-events
3m 31s
fix: attempt to address unnecessary flight status changes Label conflicting PRs #1388: Pull request #4744 synchronize by dordsor21
3m 38s fix/v7/unnecessary-flight-status-change
fix/v7/unnecessary-flight-status-change
3m 38s
fix: attempt to address unnecessary flight status changes Label conflicting PRs #1387: Pull request #4744 synchronize by dordsor21
11s
11s
don't reassign pw I guess Label conflicting PRs #1386: Commit 510150a pushed by dordsor21
9s fix/v7/unnecessary-flight-status-change
fix/v7/unnecessary-flight-status-change
9s
Back to snapshot for development Label conflicting PRs #1385: Commit 5946444 pushed by NotMyFault
2m 8s main
main
2m 8s
Release 7.5.10 Label conflicting PRs #1384: Commit 0c6f55c pushed by NotMyFault
11s 7.5.10
7.5.10
11s
Release 7.5.10 Label conflicting PRs #1383: Commit 0c6f55c pushed by NotMyFault
2m 10s main
main
2m 10s
Update Gradle to v9.2.1 (#4797) Label conflicting PRs #1382: Commit c7fe3f7 pushed by renovate bot
2m 7s main
main
2m 7s
Update dependency com.diffplug.spotless to v8.1.0 (#4798) Label conflicting PRs #1381: Commit b455b94 pushed by renovate bot
2m 7s main
main
2m 7s
Update dependency com.diffplug.spotless to v8.1.0 Label conflicting PRs #1380: Commit 7430003 pushed by renovate bot
7s renovate/spotless
renovate/spotless
7s
Update Gradle to v9.2.1 Label conflicting PRs #1379: Commit cec6e32 pushed by renovate bot
8s renovate/gradle-9.x
renovate/gradle-9.x
8s
Update worldedit to v7.3.17 Label conflicting PRs #1378: Pull request #4745 synchronize by renovate bot
7s renovate/worldedit
renovate/worldedit
7s
Update worldedit to v7.3.17 Label conflicting PRs #1377: Pull request #4745 synchronize by renovate bot
2m 9s
2m 9s
Update worldedit to v7.3.17 Label conflicting PRs #1376: Commit df645c0 pushed by renovate bot
10s renovate/worldedit
renovate/worldedit
10s
Fix javadoc generation Label conflicting PRs #1375: Commit d1a357a pushed by NotMyFault
3m 4s main
main
3m 4s