Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
397 workflow run results
397 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cluster OB now respects if a hive core is created while it is firing.… Check for merge conflicts #11401: Commit be616f3 pushed by github-merge-queue bot
June 27, 2023 07:53 4m 47s master
master
June 27, 2023 07:53 4m 47s
Removes toxin mags on shivas Check for merge conflicts #11400: Pull request #3736 opened by morrowwolf
June 27, 2023 07:50 43s
June 27, 2023 07:50 43s
Allow Mentors to Eavesdrop on Mhelps (#3720) Check for merge conflicts #11399: Commit b7afdf5 pushed by github-merge-queue bot
June 27, 2023 05:55 4m 14s master
master
June 27, 2023 05:55 4m 14s
XM88 Spotter Variant for spotter Check for merge conflicts #11398: Pull request #3733 synchronize by Hopekz
June 27, 2023 03:49 11s
June 27, 2023 03:49 11s
XM88 Spotter Variant for spotter Check for merge conflicts #11397: Pull request #3733 opened by Hopekz
June 27, 2023 03:40 14s
June 27, 2023 03:40 14s
Explosive barricade upgrade buff (#3584) Check for merge conflicts #11396: Commit e33aacf pushed by github-merge-queue bot
June 27, 2023 02:50 4m 18s master
master
June 27, 2023 02:50 4m 18s
Larva surge is limited by marines/xenos ratio (#3592) Check for merge conflicts #11395: Commit 5c4b138 pushed by github-merge-queue bot
June 27, 2023 02:34 4m 19s master
master
June 27, 2023 02:34 4m 19s
New Varadero revamp Check for merge conflicts #11394: Pull request #3676 synchronize by AnuvKH
June 27, 2023 02:14 2m 19s
June 27, 2023 02:14 2m 19s
Dropship Missile Refactor Check for merge conflicts #11393: Pull request #3732 synchronize by blackdragonTOW
June 27, 2023 00:20 14s
June 27, 2023 00:20 14s
Dropship Missile Refactor Check for merge conflicts #11392: Pull request #3732 synchronize by blackdragonTOW
June 26, 2023 23:58 12s
June 26, 2023 23:58 12s
Dropship Missile Refactor Check for merge conflicts #11391: Pull request #3732 synchronize by blackdragonTOW
June 26, 2023 23:49 12s
June 26, 2023 23:49 12s
Dropship Missile Refactor Check for merge conflicts #11390: Pull request #3732 opened by blackdragonTOW
June 26, 2023 23:42 10s
June 26, 2023 23:42 10s
Almayer Maintenence Light Adjustments Check for merge conflicts #11389: Pull request #3731 opened by blackdragonTOW
June 26, 2023 22:37 12s
June 26, 2023 22:37 12s
Makes Predator ages fit with our lore (#3688) Check for merge conflicts #11388: Commit 51c513a pushed by github-merge-queue bot
June 26, 2023 20:05 4m 16s master
master
June 26, 2023 20:05 4m 16s
Fountain pen Check for merge conflicts #11387: Pull request #3727 synchronize by Hopekz
June 26, 2023 19:39 9s
June 26, 2023 19:39 9s
Fountain pen Check for merge conflicts #11386: Pull request #3727 synchronize by Hopekz
June 26, 2023 19:33 16s
June 26, 2023 19:33 16s
Fountain pen Check for merge conflicts #11385: Pull request #3727 synchronize by Hopekz
June 26, 2023 19:29 2m 19s
June 26, 2023 19:29 2m 19s
Fountain pen Check for merge conflicts #11384: Pull request #3727 synchronize by Hopekz
June 26, 2023 19:24 10s
June 26, 2023 19:24 10s
ARES will now announce how many Foxtrot marines woke up Check for merge conflicts #11383: Pull request #3675 ready_for_review by TheGamerdk
June 26, 2023 19:17 5m 3s
June 26, 2023 19:17 5m 3s
ARES will now announce how many Foxtrot marines woke up Check for merge conflicts #11382: Pull request #3675 synchronize by TheGamerdk
June 26, 2023 19:17 3m 22s
June 26, 2023 19:17 3m 22s
ARES will now announce how many Foxtrot marines woke up Check for merge conflicts #11381: Pull request #3675 synchronize by TheGamerdk
June 26, 2023 19:13 1m 18s
June 26, 2023 19:13 1m 18s
Project ARES - Resurrection Check for merge conflicts #11380: Pull request #3298 synchronize by realforest2001
June 26, 2023 19:10 10s
June 26, 2023 19:10 10s
Project ARES - Resurrection Check for merge conflicts #11379: Pull request #3298 synchronize by github-merge-queue bot
June 26, 2023 19:10 10s
June 26, 2023 19:10 10s
Fixes a typo that made the game think there's not a CO onboard. (#3722) Check for merge conflicts #11378: Commit 8db4763 pushed by github-merge-queue bot
June 26, 2023 19:10 4m 16s master
master
June 26, 2023 19:10 4m 16s
Fix Infinite Recursion in Hugger Custom Rebound Check for merge conflicts #11377: Pull request #3730 opened by fira
June 26, 2023 17:43 10s
June 26, 2023 17:43 10s
ProTip! You can narrow down the results and go further in time using created:<2023-06-26 or the other filters available.