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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Xeno Tunnel and Shuttle Building/Anchoring Changes (#4831) Check for merge conflicts #16169: Commit 28f3738 pushed by github-merge-queue bot
November 6, 2023 11:04 4m 21s master
master
November 6, 2023 11:04 4m 21s
Adds icon for hive core and cluster to Xeno tacmap Check for merge conflicts #16168: Pull request #4820 synchronize by Birdtalon
November 6, 2023 10:51 6m 4s
November 6, 2023 10:51 6m 4s
Hotfixes being able to put anything in your boots (#4845) Check for merge conflicts #16167: Commit 38a22b8 pushed by github-merge-queue bot
November 6, 2023 10:44 4m 16s master
master
November 6, 2023 10:44 4m 16s
new whistle (#4847) Check for merge conflicts #16166: Commit 21d1d10 pushed by github-merge-queue bot
November 6, 2023 10:21 4m 16s master
master
November 6, 2023 10:21 4m 16s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16165: Pull request #4586 synchronize by Huffie56
November 6, 2023 09:56 1m 21s
November 6, 2023 09:56 1m 21s
bumps minimum compile version to 515.1609 Check for merge conflicts #16164: Pull request #4808 synchronize by harryob
November 6, 2023 09:50 3m 42s
November 6, 2023 09:50 3m 42s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16163: Pull request #4586 synchronize by Huffie56
November 6, 2023 09:47 3m 10s
November 6, 2023 09:47 3m 10s
Hijack Objectives & Self Destruct (#4699) Check for merge conflicts #16162: Commit 0991f38 pushed by github-merge-queue bot
November 6, 2023 09:47 2m 22s master
master
November 6, 2023 09:47 2m 22s
ports the tg profiler subsystem Check for merge conflicts #16161: Pull request #4793 synchronize by harryob
November 6, 2023 09:44 17s
November 6, 2023 09:44 17s
Reimplements halloween pumpkin helmets event (#4623) Check for merge conflicts #16160: Commit b421490 pushed by github-merge-queue bot
November 6, 2023 06:33 4m 21s master
master
November 6, 2023 06:33 4m 21s
Nightmare Survivor Hostility Indicator (#4628) Check for merge conflicts #16159: Commit b5123f5 pushed by github-merge-queue bot
November 6, 2023 06:15 3m 49s master
master
November 6, 2023 06:15 3m 49s
Hijack Objectives & Self Destruct Check for merge conflicts #16158: Pull request #4699 ready_for_review by Zonespace27
November 6, 2023 06:07 4m 22s
November 6, 2023 06:07 4m 22s
Hijack Objectives & Self Destruct Check for merge conflicts #16157: Pull request #4699 synchronize by Zonespace27
November 6, 2023 06:07 2m 2s
November 6, 2023 06:07 2m 2s
Hijack Objectives & Self Destruct Check for merge conflicts #16156: Pull request #4699 synchronize by Zonespace27
November 6, 2023 06:06 1m 47s
November 6, 2023 06:06 1m 47s
fixes typo in ro sign (#4811) Check for merge conflicts #16155: Commit 1e53b7d pushed by github-merge-queue bot
November 6, 2023 06:00 4m 19s master
master
November 6, 2023 06:00 4m 19s
Big Red Changes Part 1: Admin (#4838) Check for merge conflicts #16154: Commit 46be297 pushed by github-merge-queue bot
November 6, 2023 05:45 4m 20s master
master
November 6, 2023 05:45 4m 20s
Tent code changes (#4796) Check for merge conflicts #16153: Commit 8cc8778 pushed by github-merge-queue bot
November 6, 2023 05:30 4m 16s master
master
November 6, 2023 05:30 4m 16s
Removes Unused Stuff (#4835) Check for merge conflicts #16152: Commit 18cd71a pushed by github-merge-queue bot
November 6, 2023 05:16 4m 23s master
master
November 6, 2023 05:16 4m 23s
Automatic TGS DMAPI Update (#4850) Check for merge conflicts #16151: Commit 7628cf9 pushed by github-merge-queue bot
November 6, 2023 05:08 2m 16s master
master
November 6, 2023 05:08 2m 16s
New Varadero Survivor Outfit Changes (#4819) Check for merge conflicts #16150: Commit 3a28b7a pushed by github-merge-queue bot
November 6, 2023 04:53 4m 17s master
master
November 6, 2023 04:53 4m 17s
Cigars now fit in helmets Check for merge conflicts #16149: Pull request #4851 opened by Releasethesea
November 6, 2023 04:29 4m 44s
November 6, 2023 04:29 4m 44s
[NI] - Kutjevo Communications | Re-Addition of Kutjevo Blackbox (#4572) Check for merge conflicts #16148: Commit b68dc1b pushed by github-merge-queue bot
November 6, 2023 04:28 2m 15s master
master
November 6, 2023 04:28 2m 15s
Vehicles hear exterior audio Check for merge conflicts #16147: Pull request #4815 synchronize by Doubleumc
November 6, 2023 04:15 3m 42s
November 6, 2023 04:15 3m 42s
Adds Corpsman Sterile Gloves (#4826) Check for merge conflicts #16146: Commit f790028 pushed by github-merge-queue bot
November 6, 2023 04:13 4m 16s master
master
November 6, 2023 04:13 4m 16s
Replaces Nanotrasen cashcard icon with a W-Y cashcard icon. (#4832) Check for merge conflicts #16145: Commit c8c7cb9 pushed by github-merge-queue bot
November 6, 2023 03:59 4m 18s master
master
November 6, 2023 03:59 4m 18s