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,699 workflow run results
1,699 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Log Updates Check for merge conflicts #12795: Pull request #4024 synchronize by realforest2001
July 27, 2023 21:08 11s
July 27, 2023 21:08 11s
Adds a new jacket for the Commanding Officer (#3963) Check for merge conflicts #12794: Commit 3c06f56 pushed by github-merge-queue bot
July 27, 2023 21:01 4m 13s master
master
July 27, 2023 21:01 4m 13s
Adds new synthetic cosmetics Check for merge conflicts #12793: Pull request #4026 opened by Katskan
July 27, 2023 20:58 11s
July 27, 2023 20:58 11s
Fixes holding two guns firing both Check for merge conflicts #12792: Pull request #4025 opened by morrowwolf
July 27, 2023 20:35 15s
July 27, 2023 20:35 15s
Log Updates Check for merge conflicts #12791: Pull request #4024 opened by realforest2001
July 27, 2023 20:28 12s
July 27, 2023 20:28 12s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12790: Pull request #3963 ready_for_review by BeagleGaming1
July 27, 2023 19:59 11s
July 27, 2023 19:59 11s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12789: Pull request #3963 synchronize by BeagleGaming1
July 27, 2023 19:42 11s
July 27, 2023 19:42 11s
Adds a new jacket for the Commanding Officer Check for merge conflicts #12788: Pull request #3963 synchronize by BeagleGaming1
July 27, 2023 19:40 11s
July 27, 2023 19:40 11s
Sentinel buffs Check for merge conflicts #12787: Pull request #4023 opened by GoldenDarkness55
July 27, 2023 18:58 26s
July 27, 2023 18:58 26s
Prevents the queen from entering tunnels Check for merge conflicts #12786: Pull request #4022 opened by GoldenDarkness55
July 27, 2023 18:01 13s
July 27, 2023 18:01 13s
2.5 squad marines per 1 larva latejoin Check for merge conflicts #12785: Pull request #4021 synchronize by morrowwolf
July 27, 2023 17:36 2m 40s
July 27, 2023 17:36 2m 40s
2.5 squad marines per 1 larva latejoin Check for merge conflicts #12784: Pull request #4021 opened by morrowwolf
July 27, 2023 17:36 2m 59s
July 27, 2023 17:36 2m 59s
Almayer: Dirty Up Vehicle Storage/VC Bunk Check for merge conflicts #12783: Pull request #4020 synchronize by Steelpoint
July 27, 2023 17:36 2m 41s
July 27, 2023 17:36 2m 41s
fixes xeno wound icon delay (#4011) Check for merge conflicts #12782: Commit 058dd87 pushed by github-merge-queue bot
July 27, 2023 17:35 2m 13s master
master
July 27, 2023 17:35 2m 13s
Almayer: Dirty Up Vehicle Storage/VC Bunk Check for merge conflicts #12781: Pull request #4020 opened by Steelpoint
July 27, 2023 17:33 11s
July 27, 2023 17:33 11s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #12780: Pull request #3985 synchronize by morrowwolf
July 27, 2023 17:22 12s
July 27, 2023 17:22 12s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #12779: Pull request #3985 synchronize by morrowwolf
July 27, 2023 17:05 12s
July 27, 2023 17:05 12s
Xeno endgame content part 1: pylons and larva Check for merge conflicts #12778: Pull request #3985 synchronize by morrowwolf
July 27, 2023 16:22 13s
July 27, 2023 16:22 13s
Xeno Alliance Announcements + Greeno Civil War Check for merge conflicts #12777: Pull request #3990 synchronize by ihatethisengine
July 27, 2023 16:11 12s
July 27, 2023 16:11 12s
fixes xeno wound icon delay Check for merge conflicts #12776: Pull request #4011 ready_for_review by realkhad
July 27, 2023 15:52 1m 25s
July 27, 2023 15:52 1m 25s
fixes xeno wound icon delay Check for merge conflicts #12775: Pull request #4011 synchronize by realkhad
July 27, 2023 15:52 15s
July 27, 2023 15:52 15s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12774: Pull request #4003 synchronize by Zonespace27
July 27, 2023 15:36 16s
July 27, 2023 15:36 16s
Shovels can now be used to collapse tunnels (#4013) Check for merge conflicts #12773: Commit 3c84769 pushed by github-merge-queue bot
July 27, 2023 13:58 4m 15s master
master
July 27, 2023 13:58 4m 15s
More portable cades tweaks and buffs Check for merge conflicts #12772: Pull request #3967 ready_for_review by ihatethisengine
July 27, 2023 13:45 6m 11s
July 27, 2023 13:45 6m 11s
Xeno Alliance Announcements + Greeno Civil War Check for merge conflicts #12771: Pull request #3990 synchronize by ihatethisengine
July 27, 2023 13:41 2m 28s
July 27, 2023 13:41 2m 28s