Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,082 workflow run results
4,082 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Helmet Optics Update (#4549) Check for merge conflicts #15101: Commit 766b4ab pushed by github-merge-queue bot
October 4, 2023 02:00 4m 18s master
master
October 4, 2023 02:00 4m 18s
Pylon tweaks (#4571) Check for merge conflicts #15100: Commit 8713e57 pushed by github-merge-queue bot
October 4, 2023 01:41 4m 19s master
master
October 4, 2023 01:41 4m 19s
Operation time logging (#4570) Check for merge conflicts #15099: Commit 4c78d9f pushed by github-merge-queue bot
October 4, 2023 00:55 4m 15s master
master
October 4, 2023 00:55 4m 15s
Fixes req door accesses Check for merge conflicts #15098: Pull request #4582 synchronize by morrowwolf
October 4, 2023 00:21 15s
October 4, 2023 00:21 15s
Candle box nerf 😭 (#4569) Check for merge conflicts #15097: Commit 1c6e894 pushed by github-merge-queue bot
October 3, 2023 23:55 4m 15s master
master
October 3, 2023 23:55 4m 15s
Fixes req door accesses Check for merge conflicts #15096: Pull request #4582 opened by morrowwolf
October 3, 2023 23:44 4m 5s
October 3, 2023 23:44 4m 5s
Fixes storage depth for internal storages (#4568) Check for merge conflicts #15095: Commit f7b9853 pushed by github-merge-queue bot
October 3, 2023 23:40 4m 16s master
master
October 3, 2023 23:40 4m 16s
UPP surv redo and removing ambiguous text (#4576) Check for merge conflicts #15094: Commit f0c52f7 pushed by github-merge-queue bot
October 3, 2023 23:26 4m 15s master
master
October 3, 2023 23:26 4m 15s
Helmet Optics Update Check for merge conflicts #15093: Pull request #4549 synchronize by morrowwolf
October 3, 2023 23:04 15s
October 3, 2023 23:04 15s
Helmet Optics Update Check for merge conflicts #15092: Pull request #4549 synchronize by morrowwolf
October 3, 2023 22:58 14s
October 3, 2023 22:58 14s
Inventory Manipulation Keybinds (#4578) Check for merge conflicts #15091: Commit 9317991 pushed by github-merge-queue bot
October 3, 2023 20:33 4m 21s master
master
October 3, 2023 20:33 4m 21s
Squad Briefings 2: The Briefening Check for merge conflicts #15090: Pull request #4539 synchronize by Warfan1815
October 3, 2023 19:21 14s
October 3, 2023 19:21 14s
Underbarrel extinguisher no longer requires wield (#4567) Check for merge conflicts #15089: Commit 8643cb2 pushed by github-merge-queue bot
October 3, 2023 18:21 4m 17s master
master
October 3, 2023 18:21 4m 17s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15088: Pull request #4574 ready_for_review by Huffie56
October 3, 2023 16:12 11s
October 3, 2023 16:12 11s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15087: Pull request #4574 synchronize by Huffie56
October 3, 2023 15:59 16s
October 3, 2023 15:59 16s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15086: Pull request #4574 synchronize by Huffie56
October 3, 2023 15:48 15s
October 3, 2023 15:48 15s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15085: Pull request #4574 synchronize by Huffie56
October 3, 2023 12:51 25s
October 3, 2023 12:51 25s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15084: Pull request #4579 synchronize by blackdragonTOW
October 3, 2023 05:44 14s
October 3, 2023 05:44 14s
Updates dropship ammo names to be more "accurate" Check for merge conflicts #15083: Pull request #4579 opened by blackdragonTOW
October 3, 2023 05:29 13s
October 3, 2023 05:29 13s
[NI] - Kutjevo Communications | Re-Addition of Kutjevo Blackbox Check for merge conflicts #15082: Pull request #4572 synchronize by TopHatPenguin
October 3, 2023 05:26 18s
October 3, 2023 05:26 18s
Sanitizing Unreferenced Soundfiles (Piano/Violin) (#4573) Check for merge conflicts #15081: Commit da1848e pushed by github-merge-queue bot
October 3, 2023 03:01 4m 15s master
master
October 3, 2023 03:01 4m 15s
Adds drawing to tacmaps Check for merge conflicts #15080: Pull request #4475 synchronize by ghost
October 3, 2023 02:47 12s
October 3, 2023 02:47 12s
Adds drawing to tacmaps Check for merge conflicts #15079: Pull request #4475 synchronize by ghost
October 3, 2023 02:42 14s
October 3, 2023 02:42 14s
Adds CBRN ERT Check for merge conflicts #15078: Pull request #4337 synchronize by BeagleGaming1
October 3, 2023 01:57 2m 19s
October 3, 2023 01:57 2m 19s
Adds drawing to tacmaps Check for merge conflicts #15077: Pull request #4475 synchronize by ghost
October 3, 2023 01:07 14s
October 3, 2023 01:07 14s
ProTip! You can narrow down the results and go further in time using created:<2023-10-03 or the other filters available.