Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,701 workflow run results
1,701 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes holding two guns firing both (#4025) Check for merge conflicts #12845: Commit 1110ae9 pushed by github-merge-queue bot
July 29, 2023 08:02 4m 15s master
master
July 29, 2023 08:02 4m 15s
notes include round id (#4030) Check for merge conflicts #12844: Commit a33c119 pushed by github-merge-queue bot
July 29, 2023 05:38 4m 13s master
master
July 29, 2023 05:38 4m 13s
Fix banishing huggers and lesser drones (#4031) Check for merge conflicts #12843: Commit 5ee56c3 pushed by github-merge-queue bot
July 29, 2023 05:26 4m 13s master
master
July 29, 2023 05:26 4m 13s
Donator masks now properly protect from cold (#4032) Check for merge conflicts #12842: Commit f1f5fd7 pushed by github-merge-queue bot
July 29, 2023 05:12 4m 15s master
master
July 29, 2023 05:12 4m 15s
Adds new synthetic cosmetics (#4026) Check for merge conflicts #12841: Commit c5da6a3 pushed by github-merge-queue bot
July 29, 2023 04:58 4m 18s master
master
July 29, 2023 04:58 4m 18s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12840: Pull request #3903 synchronize by LC4492
July 29, 2023 03:20 11s
July 29, 2023 03:20 11s
Fixes holding two guns firing both Check for merge conflicts #12839: Pull request #4025 ready_for_review by morrowwolf
July 29, 2023 01:56 10s
July 29, 2023 01:56 10s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12838: Pull request #3903 synchronize by LC4492
July 29, 2023 01:49 13s
July 29, 2023 01:49 13s
Fixes holding two guns firing both Check for merge conflicts #12837: Pull request #4025 synchronize by morrowwolf
July 29, 2023 01:47 2m 14s
July 29, 2023 01:47 2m 14s
Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12836: Pull request #3903 synchronize by LC4492
July 28, 2023 23:51 14s
July 28, 2023 23:51 14s
Faction Access & Almayer Security Overhaul Check for merge conflicts #12835: Pull request #4035 synchronize by realforest2001
July 28, 2023 23:46 13s
July 28, 2023 23:46 13s
Faction Access & Almayer Security Overhaul Check for merge conflicts #12834: Pull request #4035 opened by realforest2001
July 28, 2023 23:43 11s
July 28, 2023 23:43 11s
Log Updates Check for merge conflicts #12833: Pull request #4024 synchronize by realforest2001
July 28, 2023 23:03 11s
July 28, 2023 23:03 11s
Drastic Changes to the USS Almayer research department (#3962) Check for merge conflicts #12832: Commit e742d13 pushed by github-merge-queue bot
July 28, 2023 22:00 4m 18s master
master
July 28, 2023 22:00 4m 18s
Can no longer bypass Lesser Drone Limit Check for merge conflicts #12831: Pull request #4034 opened by Ben10083
July 28, 2023 19:54 12s
July 28, 2023 19:54 12s
Yautja Legacy restoration & Yautja Sprite Fixes Check for merge conflicts #12830: Pull request #4033 synchronize by realforest2001
July 28, 2023 16:04 12s
July 28, 2023 16:04 12s
Yautja Legacy restoration & Yautja Sprite Fixes Check for merge conflicts #12829: Pull request #4033 opened by realforest2001
July 28, 2023 15:41 15s
July 28, 2023 15:41 15s
Donator masks now properly protect from cold Check for merge conflicts #12828: Pull request #4032 opened by realforest2001
July 28, 2023 14:06 14s
July 28, 2023 14:06 14s
2.5 squad marines per 1 larva latejoin (#4021) Check for merge conflicts #12827: Commit 8f94e7c pushed by github-merge-queue bot
July 28, 2023 12:09 4m 17s master
master
July 28, 2023 12:09 4m 17s
Xeno Alliance Announcements + Greeno Civil War (#3990) Check for merge conflicts #12826: Commit ce09b07 pushed by github-merge-queue bot
July 28, 2023 11:48 5m 9s master
master
July 28, 2023 11:48 5m 9s
Fix banishing huggers and lesser drones Check for merge conflicts #12825: Pull request #4031 synchronize by Drulikar
July 28, 2023 11:47 12s
July 28, 2023 11:47 12s
Fix banishing huggers and lesser drones Check for merge conflicts #12824: Pull request #4031 opened by Drulikar
July 28, 2023 11:15 1m 25s
July 28, 2023 11:15 1m 25s
Xeno Alliance Announcements + Greeno Civil War Check for merge conflicts #12823: Pull request #3990 synchronize by ihatethisengine
July 28, 2023 10:33 12s
July 28, 2023 10:33 12s
Xeno Alliance Announcements + Greeno Civil War Check for merge conflicts #12822: Pull request #3990 synchronize by ihatethisengine
July 28, 2023 09:24 12s
July 28, 2023 09:24 12s
Xeno Alliance Announcements + Greeno Civil War Check for merge conflicts #12821: Pull request #3990 synchronize by ihatethisengine
July 28, 2023 08:46 13s
July 28, 2023 08:46 13s