Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
671 workflow runs
671 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
042026morethings (#1517) Check for merge conflicts #1593: Commit f7eefaf pushed by Kapu1178
4m 11s master
master
4m 11s
042026morethings Check for merge conflicts #1592: Pull request #1517 synchronize by Kapu1178
9s
9s
042026morethings Check for merge conflicts #1591: Pull request #1517 synchronize by Kapu1178
2m 11s
2m 11s
Slapcrafting improvements (#1516) Check for merge conflicts #1590: Commit 446ac73 pushed by Kapu1178
4m 8s master
master
4m 8s
Slapcrafting improvements Check for merge conflicts #1589: Pull request #1516 synchronize by Kapu1178
8s
8s
atlas fixes (#1512) Check for merge conflicts #1588: Commit cd23e6e pushed by Kapu1178
4m 9s master
master
4m 9s
Fixes stairs on multi-z maps (#1511) Check for merge conflicts #1587: Commit e9c421f pushed by Kapu1178
2m 7s master
master
2m 7s
Fixes stairs on multi-z maps Check for merge conflicts #1586: Pull request #1511 synchronize by Kapu1178
10s
10s
why (#1510) Check for merge conflicts #1585: Commit 9b86232 pushed by Kapu1178
2m 9s master
master
2m 9s
030626patch (#1509) Check for merge conflicts #1584: Commit 14cc9ee pushed by Kapu1178
4m 10s master
master
4m 10s
Atlas bug fixes, minor shuttle refactor. (#1506) Check for merge conflicts #1583: Commit 50ab710 pushed by Kapu1178
4m 9s master
master
4m 9s
Atlas bug fixes, minor shuttle refactor. Check for merge conflicts #1582: Pull request #1506 synchronize by Kapu1178
9s
9s
Atlas bug fixes, minor shuttle refactor. Check for merge conflicts #1581: Pull request #1506 synchronize by Kapu1178
7s
7s
Atlas bug fixes, minor shuttle refactor. Check for merge conflicts #1580: Pull request #1506 synchronize by Kapu1178
9s
9s
atlas fixes and disposals (#1505) Check for merge conflicts #1579: Commit 0980d95 pushed by Kapu1178
2m 7s master
master
2m 7s
Update TGS DMAPI (#1503) Check for merge conflicts #1578: Commit 6cfb832 pushed by francinum
2m 9s master
master
2m 9s
Atlas Disposals + Minor Fixes Check for merge conflicts #1577: Pull request #1494 synchronize by Doctor-Derp
2m 8s
2m 8s
Blesses atmos pipes with proper coloring and layering (#1504) Check for merge conflicts #1576: Commit a11ad7c pushed by Kapu1178
4m 10s master
master
4m 10s
Update TGS DMAPI (#1471) Check for merge conflicts #1575: Commit 91e559d pushed by francinum
2m 7s master
master
2m 7s
Automatic TGS DMAPI Update Check for merge conflicts #1574: Pull request #1471 synchronize by francinum
7s
7s
Merge branch 'master' into tgs-dmapi-update Check for merge conflicts #1573: Commit f9b4488 pushed by francinum
10s tgs-dmapi-update
tgs-dmapi-update
10s
rename Superintendent and and Security jobs Check for merge conflicts #1572: Commit ddd86bf pushed by Kapu1178
10s project/daedlock
project/daedlock
10s
011726bugsnshit (#1483) Check for merge conflicts #1571: Commit c4f974b pushed by Kapu1178
2m 9s master
master
2m 9s
Update issue templates (#1493) Check for merge conflicts #1570: Commit fb41e01 pushed by Kapu1178
4m 7s master
master
4m 7s
Atlas Disposals + Minor Fixes Check for merge conflicts #1569: Pull request #1494 synchronize by Doctor-Derp
10s
10s