Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
415 workflow run results
415 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Changes to disarm / CQC code (#3970) Check for merge conflicts #12605: Commit 4a6938e pushed by github-merge-queue bot
July 24, 2023 23:56 2m 11s master
master
July 24, 2023 23:56 2m 11s
Reworks facehugged effects to make it harder to ignore Check for merge conflicts #12604: Pull request #3843 synchronize by zzzmike
July 24, 2023 23:42 7m 15s
July 24, 2023 23:42 7m 15s
Additional dmi testing for duplicates and quantity (#3867) Check for merge conflicts #12603: Commit 7b8ccd4 pushed by github-merge-queue bot
July 24, 2023 23:38 2m 16s master
master
July 24, 2023 23:38 2m 16s
Yautja emote panel Check for merge conflicts #12602: Pull request #3906 synchronize by harryob
July 24, 2023 23:28 3m 36s
July 24, 2023 23:28 3m 36s
Yautja emote panel Check for merge conflicts #12601: Pull request #3906 ready_for_review by realforest2001
July 24, 2023 23:17 6m 21s
July 24, 2023 23:17 6m 21s
Yautja emote panel Check for merge conflicts #12600: Pull request #3906 synchronize by realforest2001
July 24, 2023 23:17 5m 10s
July 24, 2023 23:17 5m 10s
3rd Party Victory Music (WY, UPP, CLF, USCM) Check for merge conflicts #12599: Pull request #3861 synchronize by blackdragonTOW
July 24, 2023 23:14 3m 54s
July 24, 2023 23:14 3m 54s
PMC Synthetic minor qol (#3930) Check for merge conflicts #12598: Commit 96b185b pushed by github-merge-queue bot
July 24, 2023 23:12 2m 24s master
master
July 24, 2023 23:12 2m 24s
3rd Party Victory Music (WY, UPP, CLF, USCM) Check for merge conflicts #12597: Pull request #3861 ready_for_review by blackdragonTOW
July 24, 2023 23:10 1m 39s
July 24, 2023 23:10 1m 39s
3rd Party Victory Music (WY, UPP, CLF, USCM) Check for merge conflicts #12596: Pull request #3861 synchronize by blackdragonTOW
July 24, 2023 23:09 53s
July 24, 2023 23:09 53s
3rd Party Victory Music (WY, UPP, CLF, USCM) Check for merge conflicts #12595: Pull request #3861 synchronize by blackdragonTOW
July 24, 2023 23:06 13s
July 24, 2023 23:06 13s
Infection Gamemode Announcement Fix Check for merge conflicts #12594: Pull request #3986 synchronize by Ben10083
July 24, 2023 22:53 5m 48s
July 24, 2023 22:53 5m 48s
Tent Tweaks & Fixes! (#3918) Check for merge conflicts #12593: Commit 788da54 pushed by github-merge-queue bot
July 24, 2023 22:51 1m 13s master
master
July 24, 2023 22:51 1m 13s
Infection Gamemode Announcement Fix Check for merge conflicts #12592: Pull request #3986 synchronize by Ben10083
July 24, 2023 22:51 2m 26s
July 24, 2023 22:51 2m 26s
Changes to squad color code Check for merge conflicts #12591: Pull request #3908 ready_for_review by BeagleGaming1
July 24, 2023 22:45 6m 0s
July 24, 2023 22:45 6m 0s
Infection Gamemode Announcement Fix Check for merge conflicts #12590: Pull request #3986 synchronize by Ben10083
July 24, 2023 22:44 7m 15s
July 24, 2023 22:44 7m 15s
Infection Gamemode Announcement Fix Check for merge conflicts #12589: Pull request #3986 opened by Ben10083
July 24, 2023 22:41 3m 37s
July 24, 2023 22:41 3m 37s
Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation Check for merge conflicts #12588: Pull request #3891 synchronize by Ben10083
July 24, 2023 22:37 7m 2s
July 24, 2023 22:37 7m 2s
Interrupt flag fix (#3974) Check for merge conflicts #12587: Commit 2945396 pushed by github-merge-queue bot
July 24, 2023 22:28 7m 14s master
master
July 24, 2023 22:28 7m 14s
Synthflesh and Predalien Butchering of Synthetics Revamp Check for merge conflicts #12586: Pull request #3910 synchronize by harryob
July 24, 2023 22:21 5m 58s
July 24, 2023 22:21 5m 58s
Pods tweaks and features, changes to pods crash chance Check for merge conflicts #12585: Pull request #3945 ready_for_review by harryob
July 24, 2023 22:14 5m 1s
July 24, 2023 22:14 5m 1s
Pods tweaks and features, changes to pods crash chance Check for merge conflicts #12584: Pull request #3945 synchronize by ihatethisengine
July 24, 2023 22:13 5m 24s
July 24, 2023 22:13 5m 24s
Fixes doubling of gadget points for second+ synth (#3936) Check for merge conflicts #12583: Commit 743897e pushed by github-merge-queue bot
July 24, 2023 22:12 4m 14s master
master
July 24, 2023 22:12 4m 14s
Yautja Armory and Ship access changes (#3877) Check for merge conflicts #12582: Commit 35d4275 pushed by github-merge-queue bot
July 24, 2023 21:59 4m 19s master
master
July 24, 2023 21:59 4m 19s
Yautja Bracer lock toggle & SD message (#3907) Check for merge conflicts #12581: Commit 16c71d5 pushed by github-merge-queue bot
July 24, 2023 21:46 4m 23s master
master
July 24, 2023 21:46 4m 23s