Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,805 workflow run results
3,805 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Squad Briefings 2: The Briefening Check for merge conflicts #14975: Pull request #4539 synchronize by Warfan1815
September 30, 2023 12:00 15s
September 30, 2023 12:00 15s
Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) Check for merge conflicts #14974: Pull request #4466 ready_for_review by Steelpoint
September 30, 2023 08:50 4m 14s
September 30, 2023 08:50 4m 14s
Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) Check for merge conflicts #14973: Pull request #4466 synchronize by Steelpoint
September 30, 2023 08:49 14s
September 30, 2023 08:49 14s
Tool Pouch Allowed Items Change Check for merge conflicts #14972: Pull request #4554 opened by Steelpoint
September 30, 2023 08:44 12s
September 30, 2023 08:44 12s
Further Synth Cosmetic Additions + Roll Sleeves + Marine Beret Addit Check for merge conflicts #14971: Pull request #4553 synchronize by Steelpoint
September 30, 2023 08:40 15s
September 30, 2023 08:40 15s
Further Synth Cosmetic Additions + Roll Sleeves + Marine Beret Addit Check for merge conflicts #14970: Pull request #4553 opened by Steelpoint
September 30, 2023 08:38 12s
September 30, 2023 08:38 12s
Fixes fake incomplete surgery Check for merge conflicts #14969: Pull request #4552 opened by morrowwolf
September 30, 2023 05:27 12s
September 30, 2023 05:27 12s
Allows M46C to take rubber munitions (#4541) Check for merge conflicts #14968: Commit 242da56 pushed by github-merge-queue bot
September 30, 2023 02:32 4m 13s master
master
September 30, 2023 02:32 4m 13s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14967: Pull request #4540 synchronize by QuickLode
September 30, 2023 02:25 16s
September 30, 2023 02:25 16s
Xeno structure cheese reduction Check for merge conflicts #14966: Pull request #4550 opened by morrowwolf
September 30, 2023 02:16 2m 14s
September 30, 2023 02:16 2m 14s
Disable join as xeno buried spawns when there is a queue (#4502) Check for merge conflicts #14965: Commit 1bd5639 pushed by github-merge-queue bot
September 30, 2023 00:26 4m 17s master
master
September 30, 2023 00:26 4m 17s
Adds drawing to tacmaps Check for merge conflicts #14964: Pull request #4475 synchronize by ghost
September 30, 2023 00:22 13s
September 30, 2023 00:22 13s
Floodlight rework Check for merge conflicts #14963: Pull request #4535 synchronize by morrowwolf
September 30, 2023 00:10 18s
September 30, 2023 00:10 18s
Adds drawing to tacmaps Check for merge conflicts #14962: Pull request #4475 synchronize by ghost
September 29, 2023 23:20 12s
September 29, 2023 23:20 12s
Adds drawing to tacmaps Check for merge conflicts #14961: Pull request #4475 synchronize by ghost
September 29, 2023 23:08 12s
September 29, 2023 23:08 12s
Helmet Optics Update Check for merge conflicts #14960: Pull request #4549 synchronize by morrowwolf
September 29, 2023 22:26 16s
September 29, 2023 22:26 16s
Helmet Optics Update Check for merge conflicts #14959: Pull request #4549 synchronize by morrowwolf
September 29, 2023 21:51 12s
September 29, 2023 21:51 12s
Helmet Optics Update Check for merge conflicts #14958: Pull request #4549 synchronize by morrowwolf
September 29, 2023 21:11 13s
September 29, 2023 21:11 13s
Adds drawing to tacmaps Check for merge conflicts #14957: Pull request #4475 synchronize by ghost
September 29, 2023 20:57 12s
September 29, 2023 20:57 12s
makes LZ detector work while landed Check for merge conflicts #14956: Pull request #4516 ready_for_review by morrowwolf
September 29, 2023 20:20 24s
September 29, 2023 20:20 24s
Helmet Optics Update Check for merge conflicts #14955: Pull request #4549 opened by morrowwolf
September 29, 2023 20:19 17s
September 29, 2023 20:19 17s
Adds drawing to tacmaps Check for merge conflicts #14954: Pull request #4475 ready_for_review by ghost
September 29, 2023 19:01 16s
September 29, 2023 19:01 16s
Adds drawing to tacmaps Check for merge conflicts #14953: Pull request #4475 synchronize by ghost
September 29, 2023 18:57 10s
September 29, 2023 18:57 10s
Adds drawing to tacmaps Check for merge conflicts #14952: Pull request #4475 synchronize by ghost
September 29, 2023 18:56 12s
September 29, 2023 18:56 12s
Adds drawing to tacmaps Check for merge conflicts #14951: Pull request #4475 synchronize by ghost
September 29, 2023 18:41 11s
September 29, 2023 18:41 11s