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,475 workflow run results
2,475 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Adds drawing to tacmaps Check for merge conflicts #15076: Pull request #4475 synchronize by ghost
October 3, 2023 00:31 12s
October 3, 2023 00:31 12s
Fixes binocs destroying while zoomed FOR REAL Check for merge conflicts #15075: Pull request #4577 ready_for_review by morrowwolf
October 2, 2023 23:36 12s
October 2, 2023 23:36 12s
Fixes binocs destroying while zoomed FOR REAL Check for merge conflicts #15074: Pull request #4577 synchronize by morrowwolf
October 2, 2023 23:13 12s
October 2, 2023 23:13 12s
Inventory Manipulation Keybinds Check for merge conflicts #15073: Pull request #4578 opened by BeagleGaming1
October 2, 2023 22:31 16s
October 2, 2023 22:31 16s
Fixes binocs destroying while zoomed FOR REAL Check for merge conflicts #15072: Pull request #4577 opened by morrowwolf
October 2, 2023 22:23 16s
October 2, 2023 22:23 16s
[NI] - Kutjevo Communications | Re-Addition of Kutjevo Blackbox Check for merge conflicts #15071: Pull request #4572 synchronize by TopHatPenguin
October 2, 2023 20:46 17s
October 2, 2023 20:46 17s
remove welding google from squad comtech vendor to avoid him to wast… Check for merge conflicts #15070: Commit 039eb60 pushed by github-merge-queue bot
October 2, 2023 19:27 4m 20s master
master
October 2, 2023 19:27 4m 20s
Fixes grab delay after performing an action Check for merge conflicts #15069: Pull request #4494 ready_for_review by Git-Nivrak
October 2, 2023 19:16 16s
October 2, 2023 19:16 16s
Add cached larva queue message to observer status panel (#4506) Check for merge conflicts #15068: Commit 8522fac pushed by github-merge-queue bot
October 2, 2023 19:13 4m 17s master
master
October 2, 2023 19:13 4m 17s
Pylon tweaks Check for merge conflicts #15067: Pull request #4571 synchronize by morrowwolf
October 2, 2023 18:15 15s
October 2, 2023 18:15 15s
Adds CBRN ERT Check for merge conflicts #15066: Pull request #4337 ready_for_review by BeagleGaming1
October 2, 2023 18:06 12s
October 2, 2023 18:06 12s
UPP surv redo and removing ambiguous text Check for merge conflicts #15065: Pull request #4576 opened by morrowwolf
October 2, 2023 17:52 13s
October 2, 2023 17:52 13s
Adds CBRN ERT Check for merge conflicts #15064: Pull request #4337 synchronize by BeagleGaming1
October 2, 2023 17:41 13s
October 2, 2023 17:41 13s
Réparations et réparations Check for merge conflicts #15063: Pull request #4560 synchronize by LC4492
October 2, 2023 17:15 13s
October 2, 2023 17:15 13s
Hijack objectives Check for merge conflicts #15062: Pull request #4391 synchronize by morrowwolf
October 2, 2023 17:11 16s
October 2, 2023 17:11 16s