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
1,469 workflow run results
1,469 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Movielike Spawning (Satchel on Spawn Removal) Check for merge conflicts #1419: Pull request #215 synchronize by Max-023
April 5, 2024 21:10 2m 43s
April 5, 2024 21:10 2m 43s
one more accessory slot Check for merge conflicts #1418: Pull request #216 opened by Nihisohel
April 5, 2024 21:08 4m 18s
April 5, 2024 21:08 4m 18s
Movielike Spawning (Satchel on Spawn Removal) Check for merge conflicts #1417: Pull request #215 synchronize by Max-023
April 5, 2024 21:06 16s
April 5, 2024 21:06 16s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1416: Pull request #180 synchronize by FslashN
April 5, 2024 19:32 2m 40s
April 5, 2024 19:32 2m 40s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1415: Pull request #180 synchronize by FslashN
April 5, 2024 19:28 11s
April 5, 2024 19:28 11s
Movie Accurate M10s Check for merge conflicts #1414: Pull request #173 synchronize by Max-023
April 5, 2024 19:12 11s
April 5, 2024 19:12 11s
Movie Accurate M10s Check for merge conflicts #1413: Pull request #173 synchronize by Max-023
April 5, 2024 18:45 1m 17s
April 5, 2024 18:45 1m 17s
Movie Accurate M10s Check for merge conflicts #1412: Pull request #173 synchronize by Max-023
April 5, 2024 18:40 12s
April 5, 2024 18:40 12s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1411: Pull request #180 synchronize by FslashN
April 5, 2024 18:12 4m 46s
April 5, 2024 18:12 4m 46s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1410: Pull request #180 synchronize by FslashN
April 5, 2024 18:10 13s
April 5, 2024 18:10 13s
Adds the ARC to the epic APC roster Check for merge conflicts #1409: Pull request #214 synchronize by DexterDude
April 5, 2024 16:15 11s
April 5, 2024 16:15 11s
Movielike Spawning (Satchel on Spawn Removal) Check for merge conflicts #1408: Pull request #215 opened by Max-023
April 5, 2024 15:01 16s
April 5, 2024 15:01 16s
Night-vision-removal-from-sg-goggles Check for merge conflicts #1407: Pull request #167 ready_for_review by KoishiVibe
April 5, 2024 06:56 11s
April 5, 2024 06:56 11s
Night-vision-removal-from-sg-goggles Check for merge conflicts #1406: Pull request #167 synchronize by KoishiVibe
April 5, 2024 06:56 12s
April 5, 2024 06:56 12s
Night-vision-removal-from-sg-goggles Check for merge conflicts #1405: Pull request #167 synchronize by KoishiVibe
April 5, 2024 06:56 10s
April 5, 2024 06:56 10s
Modifies some cosmetic effects, removes a little weirdness. Check for merge conflicts #1404: Pull request #212 synchronize by KoishiVibe
April 5, 2024 06:54 10s
April 5, 2024 06:54 10s
Adds the ARC to the epic APC roster Check for merge conflicts #1403: Pull request #214 opened by DexterDude
April 5, 2024 05:36 12s
April 5, 2024 05:36 12s
Biblically Accurate Smartguns Check for merge conflicts #1402: Pull request #213 synchronize by grifp71
April 5, 2024 03:35 11s
April 5, 2024 03:35 11s
M44 sprite and sound changes Check for merge conflicts #1401: Pull request #196 synchronize by DexterDude
April 5, 2024 01:13 14s
April 5, 2024 01:13 14s
headrags will not stop bullets anymore. FOr whatever reason, they did. Check for merge conflicts #1400: Pull request #179 synchronize by KoishiVibe
April 4, 2024 22:48 12s
April 4, 2024 22:48 12s
Biblically Accurate Smartguns Check for merge conflicts #1399: Pull request #213 opened by grifp71
April 4, 2024 20:15 13s
April 4, 2024 20:15 13s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1398: Pull request #180 synchronize by FslashN
April 4, 2024 16:17 12s
April 4, 2024 16:17 12s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1397: Pull request #180 synchronize by FslashN
April 4, 2024 16:06 13s
April 4, 2024 16:06 13s
Remote Outpost Gamemode + New Map + GM Tools Check for merge conflicts #1396: Pull request #180 synchronize by FslashN
April 4, 2024 15:58 15s
April 4, 2024 15:58 15s
MARSOC platoon! (HEAVY WIP) Check for merge conflicts #1395: Pull request #189 synchronize by kirieee
April 4, 2024 15:45 5m 45s
April 4, 2024 15:45 5m 45s