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,553 workflow run results
3,553 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Whiskey Outpost vote fix Check for merge conflicts #14823: Pull request #4525 synchronize by BeagleGaming1
September 26, 2023 23:14 4m 31s
September 26, 2023 23:14 4m 31s
Fixes combistick folding Check for merge conflicts #14822: Pull request #4526 opened by Zonespace27
September 26, 2023 23:12 46s
September 26, 2023 23:12 46s
Adds drawing to tacmaps Check for merge conflicts #14821: Pull request #4475 synchronize by ghost
September 26, 2023 23:11 19s
September 26, 2023 23:11 19s
Adds drawing to tacmaps Check for merge conflicts #14820: Pull request #4475 synchronize by ghost
September 26, 2023 23:00 16s
September 26, 2023 23:00 16s
Adds drawing to tacmaps Check for merge conflicts #14819: Pull request #4475 synchronize by ghost
September 26, 2023 22:22 12s
September 26, 2023 22:22 12s
Adds drawing to tacmaps Check for merge conflicts #14818: Pull request #4475 synchronize by ghost
September 26, 2023 22:00 16s
September 26, 2023 22:00 16s
Adds drawing to tacmaps Check for merge conflicts #14817: Pull request #4475 synchronize by ghost
September 26, 2023 22:00 14s
September 26, 2023 22:00 14s
Whiskey Outpost vote fix Check for merge conflicts #14816: Pull request #4525 opened by BeagleGaming1
September 26, 2023 21:55 13s
September 26, 2023 21:55 13s
Adds drawing to tacmaps Check for merge conflicts #14815: Pull request #4475 synchronize by ghost
September 26, 2023 21:33 10s
September 26, 2023 21:33 10s
Adds drawing to tacmaps Check for merge conflicts #14814: Pull request #4475 synchronize by ghost
September 26, 2023 21:24 15s
September 26, 2023 21:24 15s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14813: Pull request #4251 synchronize by LC4492
September 26, 2023 21:11 12s
September 26, 2023 21:11 12s
TGUI: Microwave Check for merge conflicts #14812: Pull request #4523 synchronize by Crowbar764
September 26, 2023 20:38 3m 57s
September 26, 2023 20:38 3m 57s
TGUI: Microwave Check for merge conflicts #14811: Pull request #4523 synchronize by Crowbar764
September 26, 2023 20:38 11s
September 26, 2023 20:38 11s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14810: Pull request #4251 ready_for_review by LC4492
September 26, 2023 20:23 7m 32s
September 26, 2023 20:23 7m 32s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14809: Pull request #4251 synchronize by LC4492
September 26, 2023 20:22 7m 39s
September 26, 2023 20:22 7m 39s
TGUI: Microwave Check for merge conflicts #14808: Pull request #4523 synchronize by Crowbar764
September 26, 2023 20:22 15s
September 26, 2023 20:22 15s
Adds drawing to tacmaps Check for merge conflicts #14807: Pull request #4475 synchronize by ghost
September 26, 2023 20:22 14s
September 26, 2023 20:22 14s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14806: Pull request #4251 synchronize by LC4492
September 26, 2023 20:03 16s
September 26, 2023 20:03 16s
Adds drawing to tacmaps Check for merge conflicts #14805: Pull request #4475 synchronize by ghost
September 26, 2023 19:24 13s
September 26, 2023 19:24 13s
Resprites Tactical shotgun stock + stock now comes standard on all tactical shotguns (yes you can remove it) Check for merge conflicts #14804: Pull request #4444 ready_for_review by spartanbobby
September 26, 2023 19:20 11s
September 26, 2023 19:20 11s
Resprites Tactical shotgun stock + stock now comes standard on all tactical shotguns (yes you can remove it) Check for merge conflicts #14803: Pull request #4444 synchronize by spartanbobby
September 26, 2023 19:16 11s
September 26, 2023 19:16 11s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #14802: Pull request #4251 synchronize by LC4492
September 26, 2023 19:00 16s
September 26, 2023 19:00 16s
Disease protection Check for merge conflicts #14801: Pull request #4524 synchronize by kiVts
September 26, 2023 18:58 12s
September 26, 2023 18:58 12s
UPP rank (#4380) Check for merge conflicts #14800: Commit 56fbf11 pushed by github-merge-queue bot
September 26, 2023 18:31 4m 18s master
master
September 26, 2023 18:31 4m 18s
Disease protection Check for merge conflicts #14799: Pull request #4524 synchronize by kiVts
September 26, 2023 18:18 4m 12s
September 26, 2023 18:18 4m 12s