Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,933 workflow run results
8,933 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20184: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 01:34 11s
February 28, 2024 01:34 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20183: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 01:30 13s
February 28, 2024 01:30 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20182: Pull request #5784 synchronize by GrrrKitten
February 28, 2024 01:28 2m 16s
February 28, 2024 01:28 2m 16s
Automatic TGS DMAPI Update Check for merge conflicts #20181: Pull request #5841 opened by cm13-github
February 28, 2024 00:46 16s
February 28, 2024 00:46 16s
AUTODOC.md updates Check for merge conflicts #20180: Pull request #5840 opened by SabreML
February 27, 2024 21:02 21s
February 27, 2024 21:02 21s
Reenables Prison station Check for merge conflicts #20179: Pull request #5801 synchronize by Greg-Joffer
February 27, 2024 19:22 16s
February 27, 2024 19:22 16s
(EVENT) Cortical Borers Check for merge conflicts #20178: Pull request #5829 synchronize by realforest2001
February 27, 2024 18:03 1m 7s
February 27, 2024 18:03 1m 7s
(EVENT) Cortical Borers Check for merge conflicts #20177: Pull request #5829 synchronize by realforest2001
February 27, 2024 18:02 2m 21s
February 27, 2024 18:02 2m 21s
Fixes Trading Card Descriptions (#5812) Check for merge conflicts #20176: Commit 72ffa5b pushed by github-merge-queue bot
February 27, 2024 18:00 2m 15s master
master
February 27, 2024 18:00 2m 15s
Fix for survivor hostility message. (#5828) Check for merge conflicts #20175: Commit 7620861 pushed by github-merge-queue bot
February 27, 2024 17:51 4m 17s master
master
February 27, 2024 17:51 4m 17s
Balance: adding option to buy more ammunition type and change how fuel tank pouch is destributed Check for merge conflicts #20174: Pull request #5839 ready_for_review by Huffie56
February 27, 2024 17:44 2m 11s
February 27, 2024 17:44 2m 11s
Fixes the M707 spotting scope teleporting its user and M707 attachmen… Check for merge conflicts #20173: Commit e2e5fce pushed by github-merge-queue bot
February 27, 2024 17:42 4m 18s master
master
February 27, 2024 17:42 4m 18s
Faction frequences (#5833) Check for merge conflicts #20172: Commit bfa7c55 pushed by github-merge-queue bot
February 27, 2024 17:33 4m 17s master
master
February 27, 2024 17:33 4m 17s
Names for nodes and traps. (#5831) Check for merge conflicts #20171: Commit 99fa431 pushed by github-merge-queue bot
February 27, 2024 17:24 4m 18s master
master
February 27, 2024 17:24 4m 18s
(EVENT) Cortical Borers Check for merge conflicts #20170: Pull request #5829 synchronize by realforest2001
February 27, 2024 17:12 2m 25s
February 27, 2024 17:12 2m 25s
Fix for fisticuffs causedata. (#5836) Check for merge conflicts #20169: Commit abafa69 pushed by github-merge-queue bot
February 27, 2024 17:12 2m 16s master
master
February 27, 2024 17:12 2m 16s
TWE on Who. (#5837) Check for merge conflicts #20168: Commit 8828ad8 pushed by github-merge-queue bot
February 27, 2024 17:02 4m 16s master
master
February 27, 2024 17:02 4m 16s
(EVENT) Cortical Borers Check for merge conflicts #20167: Pull request #5829 synchronize by realforest2001
February 27, 2024 16:54 2m 35s
February 27, 2024 16:54 2m 35s
Fix cas ammo consumption logic (#5824) Check for merge conflicts #20166: Commit 7eafea9 pushed by github-merge-queue bot
February 27, 2024 16:53 4m 14s master
master
February 27, 2024 16:53 4m 14s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20165: Pull request #5774 synchronize by Kaga-404
February 27, 2024 15:34 19s
February 27, 2024 15:34 19s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20164: Pull request #5774 synchronize by Kaga-404
February 27, 2024 15:26 11s
February 27, 2024 15:26 11s
Project ARES: AI Core Makeover Check for merge conflicts #20163: Pull request #5821 synchronize by realforest2001
February 27, 2024 14:43 15s
February 27, 2024 14:43 15s
Project ARES TM Holder (v4) Check for merge conflicts #20162: Pull request #5007 synchronize by realforest2001
February 27, 2024 14:39 17s
February 27, 2024 14:39 17s
Fix bound math on mass screenshot verb (#5814) Check for merge conflicts #20161: Commit d3ff37a pushed by github-merge-queue bot
February 27, 2024 13:48 4m 16s master
master
February 27, 2024 13:48 4m 16s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20160: Pull request #5774 synchronize by Kaga-404
February 27, 2024 10:50 11s
February 27, 2024 10:50 11s