Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,702 workflow run results
2,702 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds CBRN ERT Check for merge conflicts #15305: Pull request #4337 synchronize by BeagleGaming1
October 12, 2023 01:03 14s
October 12, 2023 01:03 14s
Tutorial System Check for merge conflicts #15304: Pull request #4442 synchronize by Zonespace27
October 12, 2023 00:42 14s
October 12, 2023 00:42 14s
Tutorial System Check for merge conflicts #15303: Pull request #4442 synchronize by Zonespace27
October 12, 2023 00:38 13s
October 12, 2023 00:38 13s
Photo Code Refactoring Check for merge conflicts #15302: Pull request #4636 synchronize by Drulikar
October 11, 2023 22:08 14s
October 11, 2023 22:08 14s
changed flyby tgui (#4600) Check for merge conflicts #15301: Commit 9b31e08 pushed by github-merge-queue bot
October 11, 2023 22:06 4m 16s master
master
October 11, 2023 22:06 4m 16s
changed flyby tgui Check for merge conflicts #15300: Pull request #4600 synchronize by mullenpaul
October 11, 2023 21:49 11s
October 11, 2023 21:49 11s
changed flyby tgui Check for merge conflicts #15299: Pull request #4600 synchronize by mullenpaul
October 11, 2023 21:45 12s
October 11, 2023 21:45 12s
added faction weapon spawns for uscm upp clf and pmc Check for merge conflicts #15298: Pull request #4635 synchronize by mullenpaul
October 11, 2023 21:38 14s
October 11, 2023 21:38 14s
trijent shuttle now generic Check for merge conflicts #15297: Pull request #4639 synchronize by mullenpaul
October 11, 2023 21:32 11s
October 11, 2023 21:32 11s
Vanguard Prae Pierce Refactor + Bugfix Check for merge conflicts #15296: Pull request #4641 opened by Birdtalon
October 11, 2023 21:20 23s
October 11, 2023 21:20 23s
Lurker no longer lose pounce privileges on bumping Check for merge conflicts #15295: Pull request #4640 opened by ihatethisengine
October 11, 2023 21:08 59s
October 11, 2023 21:08 59s
trijent shuttle now generic Check for merge conflicts #15294: Pull request #4639 opened by mullenpaul
October 11, 2023 21:07 14s
October 11, 2023 21:07 14s
adds fireman carry to IOs Check for merge conflicts #15293: Pull request #4637 synchronize by irakligabunia
October 11, 2023 19:48 11s
October 11, 2023 19:48 11s
adds fireman carry to IOs Check for merge conflicts #15292: Pull request #4637 opened by irakligabunia
October 11, 2023 19:37 12s
October 11, 2023 19:37 12s
Photo Code Refactoring Check for merge conflicts #15291: Pull request #4636 synchronize by Drulikar
October 11, 2023 19:25 15s
October 11, 2023 19:25 15s
Photo Code Refactoring Check for merge conflicts #15290: Pull request #4636 synchronize by Drulikar
October 11, 2023 19:19 11s
October 11, 2023 19:19 11s
Photo Code Refactoring Check for merge conflicts #15289: Pull request #4636 opened by Drulikar
October 11, 2023 19:10 19s
October 11, 2023 19:10 19s
Nightmare Survivor Hostility Indicator Check for merge conflicts #15288: Pull request #4628 ready_for_review by realforest2001
October 11, 2023 18:20 2m 43s
October 11, 2023 18:20 2m 43s
Nightmare Survivor Hostility Indicator Check for merge conflicts #15287: Pull request #4628 synchronize by realforest2001
October 11, 2023 18:20 56s
October 11, 2023 18:20 56s
Project ARES: Datacore Check for merge conflicts #15286: Pull request #4437 synchronize by realforest2001
October 11, 2023 18:18 14s
October 11, 2023 18:18 14s
M39 being able to use vertical grip again [BUFF] Check for merge conflicts #15285: Pull request #4627 ready_for_review by irakligabunia
October 11, 2023 17:08 13s
October 11, 2023 17:08 13s
added faction weapon spawns for uscm upp clf and pmc Check for merge conflicts #15284: Pull request #4635 opened by mullenpaul
October 11, 2023 16:51 17s
October 11, 2023 16:51 17s
refactor skill.dm into multiple file inside skills folder Check for merge conflicts #15283: Pull request #4633 ready_for_review by Huffie56
October 11, 2023 16:13 21s
October 11, 2023 16:13 21s
Colonial Marshals in Distress! CMB Handheld Distress Beacon (#4540) Check for merge conflicts #15282: Commit 74f6444 pushed by github-merge-queue bot
October 11, 2023 15:51 4m 17s master
master
October 11, 2023 15:51 4m 17s
makes the description for origins do something (#4619) Check for merge conflicts #15281: Commit cac1afe pushed by github-merge-queue bot
October 11, 2023 15:36 4m 18s master
master
October 11, 2023 15:36 4m 18s