Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
15,675 workflow run results
15,675 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

UPP squad selection (#7647) Check for merge conflicts #29637: Commit 6622576 pushed by github-merge-queue bot
November 26, 2024 16:35 7m 33s master
master
November 26, 2024 16:35 7m 33s
HvH roundstart AI announcments Check for merge conflicts #29636: Pull request #7675 synchronize by cuberound
November 26, 2024 16:32 2m 56s
November 26, 2024 16:32 2m 56s
SG Frontline Mode & Friends - Yay!!! Check for merge conflicts #29635: Pull request #7600 synchronize by BasilHerb
November 26, 2024 16:32 2m 30s
November 26, 2024 16:32 2m 30s
navbeacon be gone (#7676) Check for merge conflicts #29634: Commit 066efd3 pushed by github-merge-queue bot
November 26, 2024 16:28 6m 13s master
master
November 26, 2024 16:28 6m 13s
HvH roundstart AI announcments Check for merge conflicts #29633: Pull request #7675 synchronize by cuberound
November 26, 2024 15:57 15s
November 26, 2024 15:57 15s
SG Frontline Mode & Friends - Yay!!! Check for merge conflicts #29632: Pull request #7600 synchronize by BasilHerb
November 26, 2024 14:34 15s
November 26, 2024 14:34 15s
Upp status tacmap Check for merge conflicts #29631: Pull request #7672 synchronize by cuberound
November 26, 2024 14:13 15s
November 26, 2024 14:13 15s
Upp status tacmap Check for merge conflicts #29630: Pull request #7672 synchronize by cuberound
November 26, 2024 13:58 11s
November 26, 2024 13:58 11s
Upp status tacmap Check for merge conflicts #29629: Pull request #7672 synchronize by cuberound
November 26, 2024 13:36 18s
November 26, 2024 13:36 18s
Upp status tacmap Check for merge conflicts #29628: Pull request #7672 ready_for_review by cuberound
November 26, 2024 13:36 13s
November 26, 2024 13:36 13s
Upp status tacmap Check for merge conflicts #29627: Pull request #7672 synchronize by cuberound
November 26, 2024 13:35 16s
November 26, 2024 13:35 16s
Upp status tacmap Check for merge conflicts #29626: Pull request #7672 synchronize by cuberound
November 26, 2024 13:16 13s
November 26, 2024 13:16 13s
Missing icons unit test expansion Check for merge conflicts #29625: Pull request #7659 synchronize by Drulikar
November 26, 2024 13:08 1m 5s
November 26, 2024 13:08 1m 5s
Missing icons unit test expansion Check for merge conflicts #29624: Pull request #7659 synchronize by Drulikar
November 26, 2024 11:35 10s
November 26, 2024 11:35 10s
M10 Auto Pistol Check for merge conflicts #29623: Pull request #7569 synchronize by Zenith00000
November 26, 2024 11:13 11s
November 26, 2024 11:13 11s
SG Frontline Mode & Friends - Yay!!! Check for merge conflicts #29622: Pull request #7600 synchronize by BasilHerb
November 26, 2024 10:54 12s
November 26, 2024 10:54 12s
SG Frontline Mode & Friends - Yay!!! Check for merge conflicts #29621: Pull request #7600 synchronize by BasilHerb
November 26, 2024 10:53 12s
November 26, 2024 10:53 12s
Langchat is now actually readable through cameras Check for merge conflicts #29620: Pull request #7681 opened by ihatethisengine
November 26, 2024 10:43 11s
November 26, 2024 10:43 11s
Some changes to broadcasting Check for merge conflicts #29619: Pull request #7662 synchronize by ihatethisengine
November 26, 2024 10:35 14s
November 26, 2024 10:35 14s
Some changes to broadcasting Check for merge conflicts #29618: Pull request #7662 synchronize by ihatethisengine
November 26, 2024 10:35 16s
November 26, 2024 10:35 16s
Some changes to broadcasting Check for merge conflicts #29617: Pull request #7662 synchronize by ihatethisengine
November 26, 2024 10:19 11s
November 26, 2024 10:19 11s
Project ARES: Interface Data Proc Check for merge conflicts #29616: Pull request #7061 synchronize by realforest2001
November 26, 2024 09:37 17s
November 26, 2024 09:37 17s
Missing icons unit test expansion Check for merge conflicts #29615: Pull request #7659 synchronize by Drulikar
November 26, 2024 08:16 12s
November 26, 2024 08:16 12s
Loadout Customization - Items expanded & more... Check for merge conflicts #29614: Pull request #7614 synchronize by Zenith00000
November 26, 2024 07:48 11s
November 26, 2024 07:48 11s
New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Check for merge conflicts #29613: Pull request #6951 synchronize by Blundir
November 26, 2024 06:58 9s
November 26, 2024 06:58 9s