Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
571 workflow run results
571 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Platoon Renaming Check for merge conflicts #396: Pull request #55 synchronize by morrowwolf
November 7, 2023 12:51 12s
November 7, 2023 12:51 12s
Vehicle autofire Check for merge conflicts #395: Pull request #33 synchronize by Doubleumc
November 7, 2023 04:56 15s
November 7, 2023 04:56 15s
Brand-new crooshie AI Check for merge conflicts #394: Pull request #51 synchronize by xDanilcusx
November 7, 2023 01:57 11s
November 7, 2023 01:57 11s
Vehicle autofire Check for merge conflicts #393: Pull request #33 synchronize by Doubleumc
November 7, 2023 01:40 13s
November 7, 2023 01:40 13s
Platoon Renaming Check for merge conflicts #392: Pull request #55 synchronize by morrowwolf
November 6, 2023 22:03 12s
November 6, 2023 22:03 12s
Platoon Renaming Check for merge conflicts #391: Pull request #55 opened by morrowwolf
November 6, 2023 22:02 13s
November 6, 2023 22:02 13s
Lurkers hiding on structures and minor xeno interactions tweaks Check for merge conflicts #390: Pull request #54 opened by xDanilcusx
November 6, 2023 19:52 17s
November 6, 2023 19:52 17s
weird merge Check for merge conflicts #389: Commit ca7a671 pushed by morrowwolf
November 6, 2023 14:54 2m 14s master
master
November 6, 2023 14:54 2m 14s
bam Check for merge conflicts #388: Commit 742c84c pushed by morrowwolf
November 6, 2023 14:43 2m 13s master
master
November 6, 2023 14:43 2m 13s
Brand-new crooshie AI Check for merge conflicts #387: Pull request #51 synchronize by xDanilcusx
November 6, 2023 14:26 10s
November 6, 2023 14:26 10s
Brand-new crooshie AI Check for merge conflicts #386: Pull request #51 synchronize by xDanilcusx
November 6, 2023 14:07 15s
November 6, 2023 14:07 15s
Brand-new crooshie AI Check for merge conflicts #385: Pull request #51 synchronize by xDanilcusx
November 6, 2023 13:45 24s
November 6, 2023 13:45 24s
derelict almayer dorms Check for merge conflicts #384: Commit c79aa8d pushed by morrowwolf
November 6, 2023 13:34 2m 12s master
master
November 6, 2023 13:34 2m 12s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #383: Commit 394ad4f pushed by morrowwolf
November 6, 2023 13:25 2m 13s master
master
November 6, 2023 13:25 2m 13s
Xenos can now always access hivemind Check for merge conflicts #382: Pull request #53 synchronize by private-tristan
November 6, 2023 03:41 12s
November 6, 2023 03:41 12s
Xenos can now always access hivemind Check for merge conflicts #381: Pull request #53 opened by private-tristan
November 6, 2023 03:20 13s
November 6, 2023 03:20 13s
Removes xeno tips, a few other things Check for merge conflicts #380: Pull request #52 opened by private-tristan
November 6, 2023 02:46 13s
November 6, 2023 02:46 13s
Brand-new crooshie AI Check for merge conflicts #379: Pull request #51 synchronize by xDanilcusx
November 6, 2023 01:03 14s
November 6, 2023 01:03 14s
firareview Check for merge conflicts #378: Commit 32b5ab5 pushed by morrowwolf
November 6, 2023 00:25 3m 27s master
master
November 6, 2023 00:25 3m 27s
Brand-new crooshie AI Check for merge conflicts #377: Pull request #51 opened by xDanilcusx
November 6, 2023 00:24 16s
November 6, 2023 00:24 16s
New beacon sound! Check for merge conflicts #376: Pull request #50 opened by xDanilcusx
November 5, 2023 22:03 14s
November 5, 2023 22:03 14s
Adds pilot, crew chief, synth to low pop Check for merge conflicts #375: Pull request #49 synchronize by WolfOrion
November 5, 2023 21:47 11s
November 5, 2023 21:47 11s
Adds pilot, crew chief, synth to low pop Check for merge conflicts #374: Pull request #49 opened by WolfOrion
November 5, 2023 21:47 16s
November 5, 2023 21:47 16s
Deployable beacons! Check for merge conflicts #373: Commit a248407 pushed by morrowwolf
November 5, 2023 19:40 2m 16s master
master
November 5, 2023 19:40 2m 16s
Delayed Narration Check for merge conflicts #372: Commit ec8b577 pushed by morrowwolf
November 5, 2023 18:19 2m 11s master
master
November 5, 2023 18:19 2m 11s