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

Yautja Weapon Gimmicks Check for merge conflicts #12870: Pull request #4047 opened by realforest2001
July 29, 2023 19:13 15s
July 29, 2023 19:13 15s
Yautja Vision Changes Check for merge conflicts #12869: Pull request #4046 synchronize by realforest2001
July 29, 2023 18:03 10s
July 29, 2023 18:03 10s
Yautja Vision Changes Check for merge conflicts #12868: Pull request #4046 opened by realforest2001
July 29, 2023 17:56 10s
July 29, 2023 17:56 10s
Lesser Drone now Has 3 Guarantied Slots Check for merge conflicts #12867: Pull request #4045 synchronize by Ben10083
July 29, 2023 15:57 17s
July 29, 2023 15:57 17s
Lesser Drone now Has 3 Guarantied Slots Check for merge conflicts #12866: Pull request #4045 synchronize by Ben10083
July 29, 2023 15:56 12s
July 29, 2023 15:56 12s
Lesser Drone now Has 3 Guarantied Slots Check for merge conflicts #12865: Pull request #4045 opened by Ben10083
July 29, 2023 15:52 12s
July 29, 2023 15:52 12s
Standardize hugger attack windup and attack windup duration Check for merge conflicts #12864: Pull request #4044 opened by Drulikar
July 29, 2023 14:34 12s
July 29, 2023 14:34 12s
Adds White-Green Armband Sprite Check for merge conflicts #12863: Pull request #4043 opened by Steelpoint
July 29, 2023 14:10 23s
July 29, 2023 14:10 23s
J.O.E.Y. [Hyperstyled Edition] Check for merge conflicts #12862: Pull request #4042 opened by thwompa
July 29, 2023 14:08 11s
July 29, 2023 14:08 11s
Unnested Larva Maturation Prompts Check for merge conflicts #12861: Pull request #4041 opened by Drulikar
July 29, 2023 13:54 12s
July 29, 2023 13:54 12s
beserker evil style Check for merge conflicts #12860: Pull request #3977 synchronize by thwompa
July 29, 2023 13:49 13s
July 29, 2023 13:49 13s
Nightmare Insert: Trijent Dam - Crashed UPP Survivors Check for merge conflicts #12859: Pull request #3845 ready_for_review by Steelpoint
July 29, 2023 13:46 1m 21s
July 29, 2023 13:46 1m 21s
Nightmare Insert: Trijent Dam - Crashed UPP Survivors Check for merge conflicts #12858: Pull request #3845 synchronize by Steelpoint
July 29, 2023 13:45 13s
July 29, 2023 13:45 13s
Law spelling/grammar fixes Check for merge conflicts #12857: Pull request #4040 opened by zzzmike
July 29, 2023 13:19 1m 45s
July 29, 2023 13:19 1m 45s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12856: Pull request #4009 synchronize by Smov1
July 29, 2023 13:08 14s
July 29, 2023 13:08 14s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12855: Pull request #4009 ready_for_review by Smov1
July 29, 2023 11:46 11s
July 29, 2023 11:46 11s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12854: Pull request #4009 synchronize by Smov1
July 29, 2023 11:42 13s
July 29, 2023 11:42 13s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12853: Pull request #4009 synchronize by Smov1
July 29, 2023 11:42 12s
July 29, 2023 11:42 12s
Another Banishment Check For Observers Joining as a Xeno Check for merge conflicts #12852: Pull request #4039 opened by Drulikar
July 29, 2023 11:38 14s
July 29, 2023 11:38 14s
Squad Leaders Can Pick Between B12 and M4 Armour Check for merge conflicts #12851: Pull request #4038 opened by Steelpoint
July 29, 2023 10:51 10s
July 29, 2023 10:51 10s
Acid Runner Respawn Check for merge conflicts #12850: Pull request #4037 ready_for_review by ghostsheet
July 29, 2023 10:15 42s
July 29, 2023 10:15 42s
Acid Runner Respawn Check for merge conflicts #12849: Pull request #4037 synchronize by ghostsheet
July 29, 2023 10:15 13s
July 29, 2023 10:15 13s
Acid Runner Respawn Check for merge conflicts #12848: Pull request #4037 synchronize by ghostsheet
July 29, 2023 10:13 11s
July 29, 2023 10:13 11s
Acid Runner Respawn Check for merge conflicts #12847: Pull request #4037 opened by ghostsheet
July 29, 2023 09:12 12s
July 29, 2023 09:12 12s
Can no longer bypass Lesser Drone Limit (#4034) Check for merge conflicts #12846: Commit 3e9d546 pushed by github-merge-queue bot
July 29, 2023 08:36 4m 15s master
master
July 29, 2023 08:36 4m 15s