Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,081 workflow run results
5,081 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16244: Pull request #4844 synchronize by fira
November 7, 2023 15:46 1m 6s
November 7, 2023 15:46 1m 6s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16243: Pull request #4842 synchronize by fira
November 7, 2023 15:46 20s
November 7, 2023 15:46 20s
Minor Code Maintenance Bundle (deletes, standards, runtimes) (#4756) Check for merge conflicts #16242: Commit 2c9ef44 pushed by github-merge-queue bot
November 7, 2023 15:36 5m 9s master
master
November 7, 2023 15:36 5m 9s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16241: Pull request #4842 synchronize by fira
November 7, 2023 15:36 12s
November 7, 2023 15:36 12s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16240: Pull request #4828 synchronize by fira
November 7, 2023 15:34 11s
November 7, 2023 15:34 11s
Code maintenace of Stats Entities (#4750) Check for merge conflicts #16239: Commit a341a35 pushed by github-merge-queue bot
November 7, 2023 15:28 2m 14s master
master
November 7, 2023 15:28 2m 14s
/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16238: Pull request #4844 synchronize by fira
November 7, 2023 14:57 3m 40s
November 7, 2023 14:57 3m 40s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16237: Pull request #4842 synchronize by fira
November 7, 2023 14:57 3m 27s
November 7, 2023 14:57 3m 27s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16236: Pull request #4828 synchronize by fira
November 7, 2023 14:56 1m 19s
November 7, 2023 14:56 1m 19s
Adds possibility to customize crates Check for merge conflicts #16235: Pull request #4868 opened by fira
November 7, 2023 14:54 14s
November 7, 2023 14:54 14s
Fixes a Cabinet in the SW Solaris Mines. (#4854) Check for merge conflicts #16234: Commit b35057e pushed by github-merge-queue bot
November 7, 2023 13:54 4m 28s master
master
November 7, 2023 13:54 4m 28s
Adds icon for hive core and cluster to Xeno tacmap (#4820) Check for merge conflicts #16233: Commit 465b4c5 pushed by github-merge-queue bot
November 7, 2023 13:39 4m 23s master
master
November 7, 2023 13:39 4m 23s
fixes typo (#4848) Check for merge conflicts #16232: Commit 330cd7f pushed by github-merge-queue bot
November 7, 2023 13:25 4m 18s master
master
November 7, 2023 13:25 4m 18s
Adds a Colony Synthetic variant, with bug fixes (#4760) Check for merge conflicts #16231: Commit 830e002 pushed by github-merge-queue bot
November 7, 2023 11:34 4m 19s master
master
November 7, 2023 11:34 4m 19s
Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) Check for merge conflicts #16230: Pull request #4466 reopened by harryob
November 7, 2023 11:20 15s
November 7, 2023 11:20 15s
M4 Synthetic PMC 'armor' changes p1 Check for merge conflicts #16229: Pull request #4867 opened by QuickLode
November 7, 2023 10:27 12s
November 7, 2023 10:27 12s
Cigars now fit in helmets (#4851) Check for merge conflicts #16228: Commit 37f49c3 pushed by github-merge-queue bot
November 7, 2023 10:20 4m 15s master
master
November 7, 2023 10:20 4m 15s
M4 Synthetic PMC 'armor' changes Check for merge conflicts #16227: Pull request #4758 synchronize by QuickLode
November 7, 2023 10:17 13s
November 7, 2023 10:17 13s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16226: Pull request #4866 synchronize by realforest2001
November 7, 2023 08:33 11s
November 7, 2023 08:33 11s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16225: Pull request #4866 synchronize by realforest2001
November 7, 2023 08:12 16s
November 7, 2023 08:12 16s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16224: Pull request #4866 synchronize by realforest2001
November 7, 2023 08:10 14s
November 7, 2023 08:10 14s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16223: Pull request #4866 synchronize by realforest2001
November 7, 2023 08:08 15s
November 7, 2023 08:08 15s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16222: Pull request #4866 opened by realforest2001
November 7, 2023 08:03 15s
November 7, 2023 08:03 15s
Alternative IFF Check for merge conflicts #16221: Pull request #4723 synchronize by ihatethisengine
November 7, 2023 05:47 14s
November 7, 2023 05:47 14s
Xeno landmark changes Check for merge conflicts #16220: Pull request #4711 synchronize by BeagleGaming1
November 7, 2023 05:15 12s
November 7, 2023 05:15 12s