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
2,224 workflow run results
2,224 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Shotgun Overhaul Check for merge conflicts #2149: Pull request #304 synchronize by AmoryBlaine
July 23, 2024 19:49 12s
July 23, 2024 19:49 12s
WIP Massive Large Overhaul [skip ci] Check for merge conflicts #2148: Pull request #329 synchronize by AmoryBlaine
July 23, 2024 19:44 11s
July 23, 2024 19:44 11s
Fire Support Menu for GM's Check for merge conflicts #2147: Pull request #321 synchronize by sunofang
July 23, 2024 15:52 13s
July 23, 2024 15:52 13s
Remove automatic end of round vote and reboot (#341) Check for merge conflicts #2146: Commit dc898d5 pushed by AndroBetel
July 23, 2024 14:17 4m 17s master
master
July 23, 2024 14:17 4m 17s
Remove automatic end of round vote and reboot Check for merge conflicts #2145: Pull request #341 synchronize by Doubleumc
July 23, 2024 09:04 15s
July 23, 2024 09:04 15s
Remove automatic end of round vote and reboot Check for merge conflicts #2144: Pull request #341 synchronize by Doubleumc
July 23, 2024 08:45 11s
July 23, 2024 08:45 11s
Remove automatic end of round vote and reboot Check for merge conflicts #2143: Pull request #341 opened by Doubleumc
July 23, 2024 08:41 14s
July 23, 2024 08:41 14s
GM button: toggle AI xeno weeding Check for merge conflicts #2142: Pull request #340 opened by Doubleumc
July 23, 2024 07:58 13s
July 23, 2024 07:58 13s
Dropship roster expansion Check for merge conflicts #2141: Pull request #339 opened by DexterDude
July 23, 2024 05:04 12s
July 23, 2024 05:04 12s
Port "Status Effects" and fixes Check for merge conflicts #2140: Pull request #338 opened by Doubleumc
July 23, 2024 04:15 13s
July 23, 2024 04:15 13s
Fix quadtree AABB issue (#337) Check for merge conflicts #2139: Commit 5c0b967 pushed by Doubleumc
July 23, 2024 03:51 4m 15s master
master
July 23, 2024 03:51 4m 15s
Fix quadtree AABB issue Check for merge conflicts #2138: Pull request #337 opened by Doubleumc
July 23, 2024 03:41 11s
July 23, 2024 03:41 11s
Ports "Quadtree Shapes" and fix (#336) Check for merge conflicts #2137: Commit 3339ff4 pushed by Doubleumc
July 23, 2024 02:03 2m 12s master
master
July 23, 2024 02:03 2m 12s
Ports "Quadtree Shapes" and fix Check for merge conflicts #2136: Pull request #336 opened by Doubleumc
July 23, 2024 01:07 11s
July 23, 2024 01:07 11s
Shotgun Overhaul Check for merge conflicts #2135: Pull request #304 synchronize by AmoryBlaine
July 22, 2024 21:17 2m 14s
July 22, 2024 21:17 2m 14s
Shotgun Overhaul Check for merge conflicts #2134: Pull request #304 synchronize by AmoryBlaine
July 22, 2024 21:16 3m 10s
July 22, 2024 21:16 3m 10s
Shotgun Overhaul Check for merge conflicts #2133: Pull request #304 synchronize by AmoryBlaine
July 22, 2024 21:15 16s
July 22, 2024 21:15 16s
WIP Massive Large Overhaul [skip ci] Check for merge conflicts #2132: Pull request #329 synchronize by AmoryBlaine
July 22, 2024 21:12 11s
July 22, 2024 21:12 11s
Sentry Laptops In vendors (#295) Check for merge conflicts #2131: Commit a23e097 pushed by Doubleumc
July 22, 2024 21:09 2m 15s master
master
July 22, 2024 21:09 2m 15s
Shotgun Overhaul Check for merge conflicts #2130: Pull request #304 synchronize by AmoryBlaine
July 22, 2024 20:58 12s
July 22, 2024 20:58 12s
WIP Massive Large Overhaul [skip ci] Check for merge conflicts #2129: Pull request #329 synchronize by AmoryBlaine
July 22, 2024 19:58 11s
July 22, 2024 19:58 11s
WIP Massive Large Overhaul [skip ci] Check for merge conflicts #2128: Pull request #329 synchronize by AmoryBlaine
July 22, 2024 19:58 2m 14s
July 22, 2024 19:58 2m 14s
WIP Massive Large Overhaul [skip ci] Check for merge conflicts #2127: Pull request #329 synchronize by AmoryBlaine
July 22, 2024 19:54 13s
July 22, 2024 19:54 13s
sg sprites + flak jacket accessory (redone) (#292) Check for merge conflicts #2126: Commit f9fe348 pushed by Doubleumc
July 22, 2024 19:46 2m 16s master
master
July 22, 2024 19:46 2m 16s
sg sprites + flak jacket accessory (redone) Check for merge conflicts #2125: Pull request #292 synchronize by AndroBetel
July 22, 2024 19:28 17s
July 22, 2024 19:28 17s