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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

sentry armor pen dropped from 35 to 5 (#30) Check for merge conflicts #195: Commit 9aaeb7c pushed by morrowwolf
October 27, 2023 03:01 2m 14s master
master
October 27, 2023 03:01 2m 14s
sentry armor pen dropped from 35 to 5 Check for merge conflicts #194: Pull request #30 opened by private-tristan
October 27, 2023 02:33 14s
October 27, 2023 02:33 14s
New status maybe Check for merge conflicts #193: Commit 5e13760 pushed by morrowwolf
October 26, 2023 07:23 2m 11s master
master
October 26, 2023 07:23 2m 11s
soft conflict Check for merge conflicts #192: Commit df82082 pushed by morrowwolf
October 26, 2023 07:23 2m 15s master
master
October 26, 2023 07:23 2m 15s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #191: Commit 5aadb5b pushed by morrowwolf
October 26, 2023 07:12 2m 14s master
master
October 26, 2023 07:12 2m 14s
APC single crew Check for merge conflicts #190: Pull request #26 synchronize by Doubleumc
October 26, 2023 05:00 19m 59s
October 26, 2023 05:00 19m 59s
APC single crew Check for merge conflicts #189: Pull request #26 synchronize by Doubleumc
October 26, 2023 04:57 22m 43s
October 26, 2023 04:57 22m 43s
Everyone blood bag Check for merge conflicts #188: Commit 468fb17 pushed by morrowwolf
October 26, 2023 04:24 16m 50s master
master
October 26, 2023 04:24 16m 50s
extinguishers Check for merge conflicts #187: Commit 66b098f pushed by morrowwolf
October 26, 2023 04:18 14m 13s master
master
October 26, 2023 04:18 14m 13s
semiotic layer fix Check for merge conflicts #186: Commit 9ef44b1 pushed by morrowwolf
October 26, 2023 04:16 15m 24s master
master
October 26, 2023 04:16 15m 24s
sentry ammo layer Check for merge conflicts #185: Commit 437ed3f pushed by morrowwolf
October 26, 2023 04:16 16m 12s master
master
October 26, 2023 04:16 16m 12s
OK actual fix Check for merge conflicts #184: Commit e3314e2 pushed by morrowwolf
October 26, 2023 04:14 15m 44s master
master
October 26, 2023 04:14 15m 44s
client quit runtime fix Check for merge conflicts #183: Commit 33f06ee pushed by morrowwolf
October 26, 2023 04:14 15m 27s master
master
October 26, 2023 04:14 15m 27s
Jackets take two Check for merge conflicts #182: Commit 2b342b4 pushed by morrowwolf
October 26, 2023 04:08 14m 26s master
master
October 26, 2023 04:08 14m 26s
Phone overhaul (#29) Check for merge conflicts #181: Commit 29b8191 pushed by morrowwolf
October 26, 2023 04:05 17m 49s master
master
October 26, 2023 04:05 17m 49s
middle click delete xeno Check for merge conflicts #180: Commit 38055c4 pushed by morrowwolf
October 26, 2023 03:59 12m 15s master
master
October 26, 2023 03:59 12m 15s
BIG Check for merge conflicts #179: Commit 8e10cca pushed by morrowwolf
October 26, 2023 03:55 8m 19s master
master
October 26, 2023 03:55 8m 19s
discord link Check for merge conflicts #178: Commit 36b9f26 pushed by morrowwolf
October 26, 2023 03:53 6m 29s master
master
October 26, 2023 03:53 6m 29s
rail flashlights in prep Check for merge conflicts #177: Commit fa7d33a pushed by morrowwolf
October 26, 2023 03:51 4m 7s master
master
October 26, 2023 03:51 4m 7s
kills stasis bags Check for merge conflicts #176: Commit 2fa8607 pushed by morrowwolf
October 26, 2023 03:49 9m 43s master
master
October 26, 2023 03:49 9m 43s
Phone overhaul Check for merge conflicts #175: Pull request #29 synchronize by morrowwolf
October 26, 2023 03:48 26s
October 26, 2023 03:48 26s
stops xeno strains Check for merge conflicts #174: Commit eda7236 pushed by morrowwolf
October 26, 2023 03:45 2m 14s master
master
October 26, 2023 03:45 2m 14s
Phone overhaul Check for merge conflicts #173: Pull request #29 synchronize by morrowwolf
October 26, 2023 03:39 12s
October 26, 2023 03:39 12s
Phone overhaul Check for merge conflicts #172: Pull request #29 synchronize by morrowwolf
October 26, 2023 03:31 14s
October 26, 2023 03:31 14s
Phone overhaul Check for merge conflicts #171: Pull request #29 synchronize by morrowwolf
October 26, 2023 01:45 10s
October 26, 2023 01:45 10s