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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #62: Commit 846afef pushed by morrowwolf
October 16, 2023 20:45 11s master
master
October 16, 2023 20:45 11s
Vents submenu Check for merge conflicts #61: Commit 33c61b3 pushed by morrowwolf
October 16, 2023 20:43 13s master
master
October 16, 2023 20:43 13s
Welding screen welders Check for merge conflicts #60: Commit 0f289ec pushed by morrowwolf
October 16, 2023 14:49 16s master
master
October 16, 2023 14:49 16s
Detailing more (#8) Check for merge conflicts #59: Commit b5c8bb9 pushed by morrowwolf
October 16, 2023 08:10 17s master
master
October 16, 2023 08:10 17s
Detailing more Check for merge conflicts #58: Pull request #8 opened by spartanbobby
October 15, 2023 23:42 14s
October 15, 2023 23:42 14s
more map prep Check for merge conflicts #57: Commit 79ce021 pushed by morrowwolf
October 14, 2023 13:00 10s master
master
October 14, 2023 13:00 10s
squad sergeant JTAC moved to align with platoon sergeant Check for merge conflicts #56: Commit 71a8370 pushed by morrowwolf
October 14, 2023 12:34 12s master
master
October 14, 2023 12:34 12s
slight change to test github webhook again Check for merge conflicts #55: Commit 76f6880 pushed by morrowwolf
October 14, 2023 12:20 12s master
master
October 14, 2023 12:20 12s
Changes shotguns to be more sane Check for merge conflicts #54: Commit b7afa75 pushed by morrowwolf
October 14, 2023 09:25 11s master
master
October 14, 2023 09:25 11s
Flamer movement considerations plus buff Check for merge conflicts #53: Commit b3a8c4d pushed by morrowwolf
October 14, 2023 09:04 13s master
master
October 14, 2023 09:04 13s
resets number to spawn when new xeno selected Check for merge conflicts #52: Commit 74f9301 pushed by morrowwolf
October 14, 2023 07:51 13s master
master
October 14, 2023 07:51 13s
shotgun buffs Check for merge conflicts #51: Commit 758d23c pushed by morrowwolf
October 14, 2023 07:33 12s master
master
October 14, 2023 07:33 12s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #50: Commit 4a513b5 pushed by morrowwolf
October 14, 2023 07:05 11s master
master
October 14, 2023 07:05 11s
Runner Linger Behavior (#7) Check for merge conflicts #49: Commit f7d3295 pushed by morrowwolf
October 14, 2023 07:02 12s master
master
October 14, 2023 07:02 12s
Runner Linger Behavior Check for merge conflicts #48: Pull request #7 synchronize by morrowwolf
October 14, 2023 06:49 11s
October 14, 2023 06:49 11s
Runner Linger Behavior Check for merge conflicts #47: Pull request #7 synchronize by morrowwolf
October 14, 2023 06:46 14s
October 14, 2023 06:46 14s
Runner Linger Behavior Check for merge conflicts #46: Pull request #7 synchronize by morrowwolf
October 14, 2023 01:46 16s
October 14, 2023 01:46 16s
Runner Linger Behavior Check for merge conflicts #45: Pull request #7 synchronize by morrowwolf
October 14, 2023 01:22 10s
October 14, 2023 01:22 10s
Eeeh? Check for merge conflicts #44: Commit ae19fa2 pushed by morrowwolf
October 14, 2023 01:22 14s master
master
October 14, 2023 01:22 14s
Runner Linger Behavior Check for merge conflicts #43: Pull request #7 synchronize by morrowwolf
October 14, 2023 01:11 20s
October 14, 2023 01:11 20s
Runner Linger Behavior Check for merge conflicts #42: Pull request #7 opened by morrowwolf
October 14, 2023 01:09 12s
October 14, 2023 01:09 12s
medics can do limb re-attachment now Check for merge conflicts #41: Commit 944bbf7 pushed by morrowwolf
October 13, 2023 20:59 14s master
master
October 13, 2023 20:59 14s
powerloader and fireman carry buffs Check for merge conflicts #40: Commit e1bf35b pushed by morrowwolf
October 13, 2023 20:41 11s master
master
October 13, 2023 20:41 11s
Dropship accesses removed Check for merge conflicts #39: Commit 8a9d345 pushed by morrowwolf
October 13, 2023 20:38 19s master
master
October 13, 2023 20:38 19s
Smartgun IFF weird fixes Check for merge conflicts #38: Commit b7f1276 pushed by morrowwolf
October 13, 2023 20:31 19s master
master
October 13, 2023 20:31 19s