Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
753 workflow run results
753 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

OOC prefix proc Check for merge conflicts #13396: Pull request #2536 synchronize by realforest2001
August 10, 2023 12:35 13s
August 10, 2023 12:35 13s
OOC prefix proc Check for merge conflicts #13395: Pull request #2536 synchronize by realforest2001
August 10, 2023 12:05 31s
August 10, 2023 12:05 31s
OOC prefix proc Check for merge conflicts #13394: Pull request #2536 synchronize by realforest2001
August 10, 2023 12:03 15s
August 10, 2023 12:03 15s
OOC prefix proc Check for merge conflicts #13393: Pull request #2536 synchronize by realforest2001
August 10, 2023 11:17 15s
August 10, 2023 11:17 15s
OOC prefix proc Check for merge conflicts #13392: Pull request #2536 reopened by realforest2001
August 10, 2023 11:17 2m 16s
August 10, 2023 11:17 2m 16s
makes es4 use 88m4 belt icon Check for merge conflicts #13391: Pull request #4143 synchronize by realforest2001
August 10, 2023 11:12 15s
August 10, 2023 11:12 15s
Fix beams for IV drip machines when adding/removing a blood bag (#4145) Check for merge conflicts #13390: Commit 0dd5cb6 pushed by github-merge-queue bot
August 10, 2023 11:02 4m 18s master
master
August 10, 2023 11:02 4m 18s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13389: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 10:45 17s
August 10, 2023 10:45 17s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13388: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 10:44 14s
August 10, 2023 10:44 14s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13387: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 10:39 16s
August 10, 2023 10:39 16s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13386: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 10:39 15s
August 10, 2023 10:39 15s
Fix runtime with hijack burrowed PR (#4144) Check for merge conflicts #13385: Commit 59ed571 pushed by github-merge-queue bot
August 10, 2023 10:36 4m 16s master
master
August 10, 2023 10:36 4m 16s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13384: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 10:33 13s
August 10, 2023 10:33 13s
Combistick can now be yanked if dropped (#4146) Check for merge conflicts #13383: Commit dd6b556 pushed by github-merge-queue bot
August 10, 2023 10:17 4m 46s master
master
August 10, 2023 10:17 4m 46s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13382: Pull request #4151 opened by blackdragonTOW
August 10, 2023 10:16 15s
August 10, 2023 10:16 15s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13381: Pull request #4110 synchronize by Huffie56
August 10, 2023 09:55 14s
August 10, 2023 09:55 14s
Mt addings Check for merge conflicts #13380: Pull request #4149 synchronize by Dorodomki
August 10, 2023 03:10 2m 14s
August 10, 2023 03:10 2m 14s
New UPP guns Check for merge conflicts #13379: Pull request #3865 synchronize by CapCamIII
August 10, 2023 00:56 15s
August 10, 2023 00:56 15s
Mt addings Check for merge conflicts #13378: Pull request #4149 opened by Dorodomki
August 9, 2023 22:41 14s
August 9, 2023 22:41 14s
updating MP and warden vendors. adding handgun case. (#4007) Check for merge conflicts #13377: Commit d6a1cd6 pushed by github-merge-queue bot
August 9, 2023 20:08 4m 20s master
master
August 9, 2023 20:08 4m 20s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13376: Pull request #4065 synchronize by Huffie56
August 9, 2023 19:20 13s
August 9, 2023 19:20 13s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13375: Pull request #4065 synchronize by Huffie56
August 9, 2023 19:14 12s
August 9, 2023 19:14 12s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13374: Pull request #4065 synchronize by Huffie56
August 9, 2023 19:01 12s
August 9, 2023 19:01 12s
update clothing vendor in squad prep to hold all clothing items and use scaling. Check for merge conflicts #13373: Pull request #4065 synchronize by Huffie56
August 9, 2023 18:52 15s
August 9, 2023 18:52 15s
Royal Marines Commando Check for merge conflicts #13372: Pull request #4098 synchronize by spartanbobby
August 9, 2023 18:45 13s
August 9, 2023 18:45 13s