Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,008 workflow run results
10,008 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Nerve Gas Control Check for merge conflicts #21180: Pull request #5643 synchronize by realforest2001
April 3, 2024 08:06 10s
April 3, 2024 08:06 10s
Project ARES: Announcement Signatures Check for merge conflicts #21179: Pull request #6030 synchronize by realforest2001
April 3, 2024 08:01 1m 58s
April 3, 2024 08:01 1m 58s
Project ARES TM Holder (v5) Check for merge conflicts #21178: Pull request #6039 synchronize by realforest2001
April 3, 2024 08:01 11s
April 3, 2024 08:01 11s
Project ARES: Nerve Gas Control Check for merge conflicts #21177: Pull request #5643 synchronize by realforest2001
April 3, 2024 07:58 11s
April 3, 2024 07:58 11s
Changes CL and SEA office phones from Almayer category to Office (#6067) Check for merge conflicts #21176: Commit b2fd1ee pushed by github-merge-queue bot
April 3, 2024 07:55 4m 17s master
master
April 3, 2024 07:55 4m 17s
Project ARES TM Holder (v5) Check for merge conflicts #21175: Pull request #6039 synchronize by realforest2001
April 3, 2024 07:47 13s
April 3, 2024 07:47 13s
flames remove snow ! Check for merge conflicts #21174: Pull request #6001 ready_for_review by cuberound
April 3, 2024 07:39 11s
April 3, 2024 07:39 11s
flames remove snow ! Check for merge conflicts #21173: Pull request #6001 synchronize by cuberound
April 3, 2024 07:35 14s
April 3, 2024 07:35 14s
flames remove snow ! Check for merge conflicts #21172: Pull request #6001 synchronize by cuberound
April 3, 2024 07:33 13s
April 3, 2024 07:33 13s
Faster snow removal for bigger xenomorphs Check for merge conflicts #21171: Pull request #6002 synchronize by cuberound
April 3, 2024 07:21 10s
April 3, 2024 07:21 10s
Faster snow removal for bigger xenomorphs Check for merge conflicts #21170: Pull request #6002 ready_for_review by cuberound
April 3, 2024 07:18 1m 39s
April 3, 2024 07:18 1m 39s
Faster snow removal for bigger xenomorphs Check for merge conflicts #21169: Pull request #6002 synchronize by cuberound
April 3, 2024 07:17 15s
April 3, 2024 07:17 15s
Updated XM43E1 for Sniper Spec Check for merge conflicts #21168: Pull request #5774 ready_for_review by Kaga-404
April 3, 2024 06:21 20s
April 3, 2024 06:21 20s
Updated XM43E1 for Sniper Spec Check for merge conflicts #21167: Pull request #5774 synchronize by Kaga-404
April 3, 2024 06:20 30s
April 3, 2024 06:20 30s
Updated XM43E1 for Sniper Spec Check for merge conflicts #21166: Pull request #5774 synchronize by Kaga-404
April 3, 2024 06:20 11s
April 3, 2024 06:20 11s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #21165: Pull request #6073 opened by GrrrKitten
April 3, 2024 04:38 12s
April 3, 2024 04:38 12s
Small fix to Nightmare documentation example Check for merge conflicts #21164: Pull request #6072 synchronize by TopHatPenguin
April 3, 2024 03:28 10s
April 3, 2024 03:28 10s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #21163: Pull request #6071 synchronize by Venuska1117
April 3, 2024 02:09 20s
April 3, 2024 02:09 20s
Small fix to Nightmare documentation example Check for merge conflicts #21162: Pull request #6072 opened by TopHatPenguin
April 3, 2024 02:08 11s
April 3, 2024 02:08 11s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #21161: Pull request #6071 synchronize by Venuska1117
April 3, 2024 02:02 11s
April 3, 2024 02:02 11s
[V] Sorokyne Strata: Expanded Small corridors, removed 3000 unused tiles, Xenos can now weed everything except LZ's and surrounding of LZ's, allow LAZ for CAS inside structures with light blue Areas on Tacmap (glass ceiling hallways) Check for merge conflicts #21160: Pull request #6071 opened by Venuska1117
April 3, 2024 01:58 11s
April 3, 2024 01:58 11s
Project ARES: Added Tech Unlock logs (#5006) Check for merge conflicts #21159: Commit 18eddb2 pushed by github-merge-queue bot
April 3, 2024 01:33 4m 19s master
master
April 3, 2024 01:33 4m 19s
'Search by key' button for the Keybind menu Check for merge conflicts #21158: Pull request #6070 opened by SabreML
April 2, 2024 23:27 15s
April 2, 2024 23:27 15s
Battlepass System Check for merge conflicts #21157: Pull request #6060 synchronize by Zonespace27
April 2, 2024 22:11 13s
April 2, 2024 22:11 13s
Fixes two of the brig's cell shutters not being linked to the button Check for merge conflicts #21156: Pull request #6068 opened by Johannes2262
April 2, 2024 15:51 12s
April 2, 2024 15:51 12s