Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,082 workflow run results
4,082 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Disease protection (#4524) Check for merge conflicts #15176: Commit 199a27a pushed by github-merge-queue bot
October 7, 2023 15:30 4m 15s master
master
October 7, 2023 15:30 4m 15s
Fixes incorrect floating objects/incorrect tiles/incorrect area/HEFA … Check for merge conflicts #15175: Commit 2e35184 pushed by github-merge-queue bot
October 7, 2023 15:16 4m 18s master
master
October 7, 2023 15:16 4m 18s
Nerf UPP Surv Guns Check for merge conflicts #15174: Pull request #4597 synchronize by Steelpoint
October 7, 2023 14:51 8m 18s
October 7, 2023 14:51 8m 18s
Updates dropship ammo names to be more "accurate" (#4579) Check for merge conflicts #15173: Commit a17b58a pushed by github-merge-queue bot
October 7, 2023 14:50 2m 18s master
master
October 7, 2023 14:50 2m 18s
Hydroponics minor fixes Check for merge conflicts #15172: Pull request #4589 synchronize by Zonespace27
October 7, 2023 14:44 1m 6s
October 7, 2023 14:44 1m 6s
Hydroponics minor fixes Check for merge conflicts #15171: Pull request #4589 synchronize by Zonespace27
October 7, 2023 14:44 1m 0s
October 7, 2023 14:44 1m 0s
ert tweaks Check for merge conflicts #15170: Pull request #4484 reopened by BroseidonMOO
October 7, 2023 14:12 12s
October 7, 2023 14:12 12s
Removes sword from XO weapon choice. Check for merge conflicts #15169: Pull request #4598 opened by CapCamIII
October 7, 2023 12:41 14s
October 7, 2023 12:41 14s
Nerf UPP Surv Guns Check for merge conflicts #15168: Pull request #4597 synchronize by Steelpoint
October 7, 2023 08:45 13s
October 7, 2023 08:45 13s
Nerf UPP Surv Guns Check for merge conflicts #15167: Pull request #4597 opened by Steelpoint
October 7, 2023 08:37 16s
October 7, 2023 08:37 16s
Adds MP, OT and CL Tents Check for merge conflicts #15166: Pull request #4596 opened by Steelpoint
October 7, 2023 08:27 20s
October 7, 2023 08:27 20s
Reverts all recent nerfs to Warrior Check for merge conflicts #15165: Pull request #4595 opened by usnpeepoo
October 7, 2023 05:26 16s
October 7, 2023 05:26 16s
Adds CBRN ERT Check for merge conflicts #15164: Pull request #4337 ready_for_review by BeagleGaming1
October 6, 2023 20:51 16s
October 6, 2023 20:51 16s
Adds CBRN ERT Check for merge conflicts #15163: Pull request #4337 synchronize by BeagleGaming1
October 6, 2023 20:41 12s
October 6, 2023 20:41 12s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15162: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 18:59 15s
October 6, 2023 18:59 15s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15161: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 18:54 13s
October 6, 2023 18:54 13s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15160: Pull request #4579 synchronize by blackdragonTOW
October 6, 2023 18:43 12s
October 6, 2023 18:43 12s
Fixes grab delay after performing an action Check for merge conflicts #15159: Pull request #4494 synchronize by Git-Nivrak
October 6, 2023 17:38 12s
October 6, 2023 17:38 12s
Revert "Changes to EZ Autoinjectors (#4167)" Check for merge conflicts #15158: Pull request #4593 opened by Git-Nivrak
October 6, 2023 16:27 11s
October 6, 2023 16:27 11s
Fixes grab delay after performing an action Check for merge conflicts #15157: Pull request #4494 ready_for_review by Git-Nivrak
October 6, 2023 16:17 11s
October 6, 2023 16:17 11s
Fixes grab delay after performing an action Check for merge conflicts #15156: Pull request #4494 synchronize by Git-Nivrak
October 6, 2023 16:14 12s
October 6, 2023 16:14 12s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #15155: Pull request #4586 ready_for_review by Huffie56
October 6, 2023 14:11 12s
October 6, 2023 14:11 12s
DFB property changes. Check for merge conflicts #15154: Pull request #4590 synchronize by kiVts
October 6, 2023 12:57 14s
October 6, 2023 12:57 14s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #15153: Pull request #4586 synchronize by Huffie56
October 6, 2023 12:55 12s
October 6, 2023 12:55 12s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #15152: Pull request #4586 synchronize by Huffie56
October 6, 2023 12:22 13s
October 6, 2023 12:22 13s