Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
354 workflow runs
354 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

admin -> gamemaster simple stuff (#1199) Check for merge conflicts #922: Commit 78b96dc pushed by Kapu1178
March 6, 2025 22:15 40s master
master
March 6, 2025 22:15 40s
https://github.com/tgstation/tgstation/pull/86935 (#1233) Check for merge conflicts #921: Commit e166541 pushed by Kapu1178
March 6, 2025 20:51 40s master
master
March 6, 2025 20:51 40s
https://github.com/tgstation/tgstation/pull/73480 (#1231) Check for merge conflicts #920: Commit 7e35319 pushed by Kapu1178
March 6, 2025 19:05 38s master
master
March 6, 2025 19:05 38s
https://github.com/tgstation/tgstation/pull/89146 (#1230) Check for merge conflicts #919: Commit 5bea7bb pushed by Kapu1178
March 6, 2025 19:01 47s master
master
March 6, 2025 19:01 47s
chem rounding return values are more accurate (#1229) Check for merge conflicts #918: Commit e42150f pushed by Kapu1178
March 6, 2025 18:52 39s master
master
March 6, 2025 18:52 39s
https://github.com/tgstation/tgstation/pull/86815 (#1228) Check for merge conflicts #917: Commit 25312af pushed by Kapu1178
March 6, 2025 18:42 41s master
master
March 6, 2025 18:42 41s
Sanctification (#1084) Check for merge conflicts #916: Commit 1b89586 pushed by Kapu1178
March 6, 2025 18:23 43s master
master
March 6, 2025 18:23 43s
disables heretics (#1227) Check for merge conflicts #915: Commit 5e7790a pushed by Kapu1178
March 6, 2025 17:59 46s master
master
March 6, 2025 17:59 46s
Pain Tweaks (#1215) Check for merge conflicts #914: Commit 517505d pushed by Kapu1178
March 5, 2025 22:31 38s master
master
March 5, 2025 22:31 38s
Rewrites the splashscreen (#1221) Check for merge conflicts #913: Commit f1f59a7 pushed by Kapu1178
March 5, 2025 22:31 49s master
master
March 5, 2025 22:31 49s
Adds wires (#1225) Check for merge conflicts #912: Commit 361fe32 pushed by Kapu1178
March 2, 2025 01:44 42s master
master
March 2, 2025 01:44 42s
030125bugs (#1224) Check for merge conflicts #911: Commit 4b53f36 pushed by Kapu1178
March 1, 2025 22:49 43s master
master
March 1, 2025 22:49 43s
Removes unnecessary MySQL container from CI Task (#1220) Check for merge conflicts #910: Commit 53c553c pushed by francinum
February 28, 2025 22:47 43s master
master
February 28, 2025 22:47 43s
json savefiles (#1211) Check for merge conflicts #909: Commit d68dcb9 pushed by Kapu1178
February 27, 2025 05:18 44s master
master
February 27, 2025 05:18 44s
adds ratsucking (#1219) Check for merge conflicts #908: Commit 9e98cc6 pushed by Kapu1178
February 26, 2025 05:53 46s master
master
February 26, 2025 05:53 46s
Persistent client (#1218) Check for merge conflicts #907: Commit 1103153 pushed by Kapu1178
February 26, 2025 02:47 39s master
master
February 26, 2025 02:47 39s
02/22/25 Bugs (#1217) Check for merge conflicts #906: Commit de40c8e pushed by Kapu1178
February 25, 2025 02:36 57s master
master
February 25, 2025 02:36 57s
negative thirst (#1216) Check for merge conflicts #905: Commit 9a8681b pushed by Kapu1178
February 22, 2025 03:03 42s master
master
February 22, 2025 03:03 42s
wound cleanup (#1213) Check for merge conflicts #904: Commit 82a3410 pushed by Kapu1178
February 19, 2025 01:36 49s master
master
February 19, 2025 01:36 49s
Aetherening (#1121) Check for merge conflicts #903: Commit 4aa2915 pushed by Kapu1178
February 17, 2025 05:11 40s master
master
February 17, 2025 05:11 40s
lmao (#1214) Check for merge conflicts #902: Commit ef54ebc pushed by Kapu1178
February 17, 2025 05:05 48s master
master
February 17, 2025 05:05 48s
Vampire Expansion Pack 2 (#1212) Check for merge conflicts #901: Commit f822b20 pushed by Kapu1178
February 16, 2025 22:42 47s master
master
February 16, 2025 22:42 47s
Replaces Tip of the Round entries (#1208) Check for merge conflicts #900: Commit 5c130fe pushed by Kapu1178
February 14, 2025 08:16 51s master
master
February 14, 2025 08:16 51s
antag + job fluff (#1207) Check for merge conflicts #899: Commit 4e04925 pushed by Kapu1178
February 13, 2025 05:40 46s master
master
February 13, 2025 05:40 46s
Antagonist Selector Datums (#1193) Check for merge conflicts #898: Commit 3cc8b97 pushed by Kapu1178
February 13, 2025 03:28 43s master
master
February 13, 2025 03:28 43s