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
376 workflow run results
376 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

no space carp Check for merge conflicts #326: Commit 682ed60 pushed by morrowwolf
November 2, 2023 18:28 14s master
master
November 2, 2023 18:28 14s
Maybe fixes problem with send to cryo slot freeing Check for merge conflicts #325: Commit 8118547 pushed by morrowwolf
November 2, 2023 18:26 4m 12s master
master
November 2, 2023 18:26 4m 12s
AI bug sweep 2 Check for merge conflicts #324: Pull request #41 synchronize by morrowwolf
November 2, 2023 18:09 12s
November 2, 2023 18:09 12s
AI bug sweep 2 Check for merge conflicts #323: Pull request #41 opened by morrowwolf
November 2, 2023 18:02 13s
November 2, 2023 18:02 13s
moves communication clarity around Check for merge conflicts #322: Commit 621c3fa pushed by morrowwolf
November 2, 2023 17:00 2m 18s master
master
November 2, 2023 17:00 2m 18s
large crates now nom stuff Check for merge conflicts #321: Commit 2194b36 pushed by morrowwolf
November 2, 2023 16:52 2m 16s master
master
November 2, 2023 16:52 2m 16s
Removes Xeno PVTs, removes timelocks for prefixes. (#39) Check for merge conflicts #320: Commit 201dbc6 pushed by morrowwolf
November 2, 2023 09:36 2m 20s master
master
November 2, 2023 09:36 2m 20s
Removes Xeno PVTs, removes timelocks for prefixes. Check for merge conflicts #319: Pull request #39 synchronize by morrowwolf
November 2, 2023 09:27 20s
November 2, 2023 09:27 20s
Slotting Rework part 1 Check for merge conflicts #318: Pull request #40 opened by morrowwolf
November 2, 2023 09:07 19s
November 2, 2023 09:07 19s
Midway (#37) Check for merge conflicts #317: Commit af4fb30 pushed by morrowwolf
November 2, 2023 07:24 2m 13s master
master
November 2, 2023 07:24 2m 13s
Removes Xeno PVTs, removes timelocks for prefixes. Check for merge conflicts #316: Pull request #39 opened by private-tristan
November 2, 2023 02:41 16s
November 2, 2023 02:41 16s
and this too Check for merge conflicts #315: Commit 499c8dd pushed by morrowwolf
November 1, 2023 16:30 2m 11s master
master
November 1, 2023 16:30 2m 11s
shoots dumbass mandatory snowflake staff shit Check for merge conflicts #314: Commit d8aa9ff pushed by morrowwolf
November 1, 2023 16:27 2m 11s master
master
November 1, 2023 16:27 2m 11s
replaces falling falcons in blurb text with solar devils (#38) Check for merge conflicts #313: Commit 8f8f00c pushed by morrowwolf
November 1, 2023 16:07 2m 11s master
master
November 1, 2023 16:07 2m 11s
replaces falling falcons in blurb text with solar devils Check for merge conflicts #312: Pull request #38 opened by AndroBetel
November 1, 2023 15:45 13s
November 1, 2023 15:45 13s
Midway Check for merge conflicts #311: Pull request #37 synchronize by morrowwolf
November 1, 2023 15:27 14s
November 1, 2023 15:27 14s
Midway Check for merge conflicts #310: Pull request #37 synchronize by morrowwolf
November 1, 2023 15:17 14s
November 1, 2023 15:17 14s
Facehugger AI & autodoc now can extract embryos Check for merge conflicts #309: Pull request #17 synchronize by xDanilcusx
November 1, 2023 12:56 15s
November 1, 2023 12:56 15s
Midway Check for merge conflicts #308: Pull request #37 opened by morrowwolf
November 1, 2023 12:40 12s
November 1, 2023 12:40 12s
Facehugger AI & autodoc now can extract embryos Check for merge conflicts #307: Pull request #17 synchronize by xDanilcusx
November 1, 2023 12:31 16s
November 1, 2023 12:31 16s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #306: Commit 1b77e16 pushed by morrowwolf
November 1, 2023 10:28 2m 10s master
master
November 1, 2023 10:28 2m 10s
OK linters Check for merge conflicts #305: Commit 1358b8d pushed by morrowwolf
November 1, 2023 09:56 2m 14s master
master
November 1, 2023 09:56 2m 14s
Shivas weather holder Check for merge conflicts #304: Commit 4966a7f pushed by morrowwolf
November 1, 2023 09:15 2m 16s master
master
November 1, 2023 09:15 2m 16s
fixes create xeno silent ERT Check for merge conflicts #303: Commit e7d7320 pushed by morrowwolf
November 1, 2023 08:50 3m 48s master
master
November 1, 2023 08:50 3m 48s
increased gib chance for xenos Check for merge conflicts #302: Commit 5c91706 pushed by morrowwolf
November 1, 2023 08:47 2m 14s master
master
November 1, 2023 08:47 2m 14s