Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,515 workflow run results
5,515 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes fire alarm closing shutters for adjacent area doors Check for merge conflicts #18165: Pull request #5325 ready_for_review by ghost
December 28, 2023 13:04 9s
December 28, 2023 13:04 9s
Fixes fire alarm closing shutters for adjacent area doors Check for merge conflicts #18164: Pull request #5325 synchronize by ghost
December 28, 2023 12:56 13s
December 28, 2023 12:56 13s
Dynamic price for omnisentryguns Check for merge conflicts #18163: Pull request #5226 synchronize by cuberound
December 28, 2023 12:44 11s
December 28, 2023 12:44 11s
Fixes fire alarm closing shutters for adjacent area doors Check for merge conflicts #18162: Pull request #5325 synchronize by ghost
December 28, 2023 12:37 15s
December 28, 2023 12:37 15s
Adds the XM51 Breaching Scattergun Check for merge conflicts #18161: Pull request #5086 ready_for_review by VileBeggar
December 28, 2023 11:09 11s
December 28, 2023 11:09 11s
Adds the XM51 Breaching Scattergun Check for merge conflicts #18160: Pull request #5086 synchronize by VileBeggar
December 28, 2023 10:26 14s
December 28, 2023 10:26 14s
new sprites for predalien (abomination) and co. (#5269) Check for merge conflicts #18159: Commit 0747cc8 pushed by github-merge-queue bot
December 28, 2023 09:53 4m 15s master
master
December 28, 2023 09:53 4m 15s
Polish Dropship Weapons UI Check for merge conflicts #18158: Pull request #5298 synchronize by Drulikar
December 28, 2023 08:58 14s
December 28, 2023 08:58 14s
Fixes the Hive Status error when the Queen dies Check for merge conflicts #18157: Pull request #5316 ready_for_review by SabreML
December 28, 2023 02:21 9s
December 28, 2023 02:21 9s
Fixes the Hive Status error when the Queen dies Check for merge conflicts #18156: Pull request #5316 synchronize by SabreML
December 28, 2023 02:14 10s
December 28, 2023 02:14 10s
Fixes the Hive Status error when the Queen dies Check for merge conflicts #18155: Pull request #5316 synchronize by SabreML
December 28, 2023 02:08 2m 16s
December 28, 2023 02:08 2m 16s
Fixes fire alarm closing shutters for adjacent area doors Check for merge conflicts #18154: Pull request #5325 synchronize by ghost
December 28, 2023 00:05 27s
December 28, 2023 00:05 27s
Fixes fire alarm closing shutters for adjacent area doors Check for merge conflicts #18153: Pull request #5325 opened by ghost
December 28, 2023 00:04 13s
December 28, 2023 00:04 13s
branch screw up. Check for merge conflicts #18152: Pull request #5324 opened by ghost
December 27, 2023 23:58 13s
December 27, 2023 23:58 13s
Shoe item storage refactor (#5263) Check for merge conflicts #18151: Commit 92a96a8 pushed by github-merge-queue bot
December 27, 2023 23:41 4m 17s master
master
December 27, 2023 23:41 4m 17s
Moves around "Remove Splints" and "View playtime" Check for merge conflicts #18150: Pull request #5323 synchronize by Red-byte3D
December 27, 2023 23:34 6m 45s
December 27, 2023 23:34 6m 45s
Moves around "Remove Splints" and "View playtime" Check for merge conflicts #18149: Pull request #5323 opened by Red-byte3D
December 27, 2023 23:31 1m 13s
December 27, 2023 23:31 1m 13s
Fixes a couple of runtimes with xenos dying Check for merge conflicts #18148: Pull request #5322 opened by Birdtalon
December 27, 2023 23:25 13s
December 27, 2023 23:25 13s
Fixes the failure message when trying to switch pyro fuels Check for merge conflicts #18147: Pull request #5321 opened by SabreML
December 27, 2023 23:17 33s
December 27, 2023 23:17 33s
Dynamic price for omnisentryguns Check for merge conflicts #18146: Pull request #5226 synchronize by cuberound
December 27, 2023 23:16 11s
December 27, 2023 23:16 11s
Fixes runtime in stripping Check for merge conflicts #18145: Pull request #5320 opened by Birdtalon
December 27, 2023 23:01 13s
December 27, 2023 23:01 13s
Dynamic price for omnisentryguns Check for merge conflicts #18144: Pull request #5226 synchronize by cuberound
December 27, 2023 22:55 11s
December 27, 2023 22:55 11s
Fixes a simple race condition in XRF Setup (#5312) Check for merge conflicts #18143: Commit eecedaa pushed by github-merge-queue bot
December 27, 2023 22:52 4m 17s master
master
December 27, 2023 22:52 4m 17s
Dynamic price for omnisentryguns Check for merge conflicts #18142: Pull request #5226 synchronize by cuberound
December 27, 2023 22:48 9s
December 27, 2023 22:48 9s
Fixes a laser cannon bug which I added Check for merge conflicts #18141: Pull request #5319 opened by SabreML
December 27, 2023 22:22 13s
December 27, 2023 22:22 13s