Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,753 workflow run results
3,753 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes minor mapping errors Check for merge conflicts #16327: Pull request #4873 synchronize by Releasethesea
November 9, 2023 23:35 2m 51s
November 9, 2023 23:35 2m 51s
/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16326: Pull request #4844 synchronize by fira
November 9, 2023 23:31 4m 43s
November 9, 2023 23:31 4m 43s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16325: Pull request #4842 synchronize by fira
November 9, 2023 23:30 2m 43s
November 9, 2023 23:30 2m 43s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16324: Pull request #4828 synchronize by fira
November 9, 2023 23:29 13s
November 9, 2023 23:29 13s
/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16323: Pull request #4844 synchronize by fira
November 9, 2023 23:25 15s
November 9, 2023 23:25 15s
Colonial Space Grunts Check for merge conflicts #16322: Pull request #4884 synchronize by Releasethesea
November 9, 2023 23:17 13s
November 9, 2023 23:17 13s
/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16321: Pull request #4844 synchronize by fira
November 9, 2023 21:48 13s
November 9, 2023 21:48 13s
/tg/ Status Effects Part 3A - Daze Refactor Check for merge conflicts #16320: Pull request #4844 synchronize by fira
November 9, 2023 21:44 13s
November 9, 2023 21:44 13s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16319: Pull request #4842 synchronize by fira
November 9, 2023 21:39 18s
November 9, 2023 21:39 18s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16318: Pull request #4828 synchronize by fira
November 9, 2023 21:32 12s
November 9, 2023 21:32 12s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16317: Pull request #4828 synchronize by fira
November 9, 2023 20:48 14s
November 9, 2023 20:48 14s
Synthetic internal powercell Check for merge conflicts #16316: Pull request #4559 synchronize by QuickLode
November 9, 2023 20:34 16s
November 9, 2023 20:34 16s
Should fix pumpkins, PUMPKINS EVERYWHERE (#4881) Check for merge conflicts #16315: Commit 653208a pushed by github-merge-queue bot
November 9, 2023 19:21 4m 16s master
master
November 9, 2023 19:21 4m 16s
Le Almayer changes (#4864) Check for merge conflicts #16314: Commit 2c6fbc1 pushed by github-merge-queue bot
November 9, 2023 19:02 4m 20s master
master
November 9, 2023 19:02 4m 20s
Eggsac carrier revival Check for merge conflicts #16313: Pull request #4716 synchronize by Birdtalon
November 9, 2023 18:39 14s
November 9, 2023 18:39 14s
Eggsac carrier revival Check for merge conflicts #16312: Pull request #4716 synchronize by Birdtalon
November 9, 2023 18:36 15s
November 9, 2023 18:36 15s
Makes rear dropship doors solid again and refactors multi door filler… Check for merge conflicts #16311: Commit 4e52130 pushed by github-merge-queue bot
November 9, 2023 15:58 4m 18s master
master
November 9, 2023 15:58 4m 18s
Refactor of ammo and it's children file to clean a bit BE code. Check for merge conflicts #16310: Pull request #4886 opened by Huffie56
November 9, 2023 14:59 14s
November 9, 2023 14:59 14s
Makes rear dropship doors solid again and refactors multi door filler turf logic Check for merge conflicts #16309: Pull request #4837 synchronize by Das15
November 9, 2023 14:37 15s
November 9, 2023 14:37 15s
/tg/ Status Effects Prelude D - Mob Freeze Refactor Check for merge conflicts #16308: Pull request #4878 synchronize by fira
November 9, 2023 13:57 10s
November 9, 2023 13:57 10s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16307: Pull request #4876 ready_for_review by Huffie56
November 9, 2023 13:56 14s
November 9, 2023 13:56 14s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16306: Pull request #4828 synchronize by fira
November 9, 2023 13:52 13s
November 9, 2023 13:52 13s
Minor fixes for Loadout Items (#4849) Check for merge conflicts #16305: Commit d120fa7 pushed by github-merge-queue bot
November 9, 2023 13:51 2m 16s master
master
November 9, 2023 13:51 2m 16s
Componentizes power cells (#4855) Check for merge conflicts #16304: Commit 41b2e51 pushed by github-merge-queue bot
November 9, 2023 13:38 2m 20s master
master
November 9, 2023 13:38 2m 20s
/tg/ Status Effects Prelude D - Mob Freeze Refactor Check for merge conflicts #16303: Pull request #4878 synchronize by fira
November 9, 2023 13:29 12s
November 9, 2023 13:29 12s