Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,892 workflow run results
7,892 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES TM Holder (v4) Check for merge conflicts #19054: Pull request #5007 synchronize by realforest2001
January 27, 2024 16:01 12s
January 27, 2024 16:01 12s
increases exxecution speed of CAS FM, number is up for a debate Check for merge conflicts #19053: Pull request #5571 synchronize by cuberound
January 27, 2024 14:15 13s
January 27, 2024 14:15 13s
Project ARES TM Holder (v4) Check for merge conflicts #19052: Pull request #5007 synchronize by realforest2001
January 27, 2024 13:40 12s
January 27, 2024 13:40 12s
increases exxecution speed of CAS FM, number is up for a debate Check for merge conflicts #19051: Pull request #5571 opened by cuberound
January 27, 2024 13:35 11s
January 27, 2024 13:35 11s
Project ARES TM Holder (v4) Check for merge conflicts #19050: Pull request #5007 synchronize by realforest2001
January 27, 2024 11:43 1m 27s
January 27, 2024 11:43 1m 27s
Project ARES: Added Tech Unlock logs Check for merge conflicts #19049: Pull request #5006 synchronize by realforest2001
January 27, 2024 11:42 14s
January 27, 2024 11:42 14s
Project ARES TM Holder (v4) Check for merge conflicts #19048: Pull request #5007 synchronize by realforest2001
January 27, 2024 11:36 15s
January 27, 2024 11:36 15s
Project ARES: Admin Console Check for merge conflicts #19047: Pull request #4182 synchronize by realforest2001
January 27, 2024 11:18 10s
January 27, 2024 11:18 10s
refactor : turning newscasters into "props" Check for merge conflicts #19046: Pull request #5522 ready_for_review by Huffie56
January 27, 2024 10:26 10s
January 27, 2024 10:26 10s
refactor multiple files concerning robot and mechs. Check for merge conflicts #19045: Pull request #5538 ready_for_review by Huffie56
January 27, 2024 10:17 1m 14s
January 27, 2024 10:17 1m 14s
refactor : turning newscasters into "props" Check for merge conflicts #19044: Pull request #5522 synchronize by Huffie56
January 27, 2024 10:15 10s
January 27, 2024 10:15 10s
refactor : turning newscasters into "props" Check for merge conflicts #19043: Pull request #5522 synchronize by Huffie56
January 27, 2024 10:15 13s
January 27, 2024 10:15 13s
refactor multiple files concerning robot and mechs. Check for merge conflicts #19042: Pull request #5538 synchronize by Huffie56
January 27, 2024 09:56 10s
January 27, 2024 09:56 10s
Removes burrower from feral ERT Check for merge conflicts #19041: Pull request #5570 opened by private-tristan
January 27, 2024 04:58 13s
January 27, 2024 04:58 13s
M3-L Pattern Light Armor Added to IO Vendors Check for merge conflicts #19040: Pull request #5567 opened by MobiusWon
January 27, 2024 01:24 16s
January 27, 2024 01:24 16s
Green Beret sprite fix Check for merge conflicts #19039: Pull request #5566 synchronize by Oyu07
January 27, 2024 01:11 2m 14s
January 27, 2024 01:11 2m 14s
Green Beret sprite fix Check for merge conflicts #19038: Pull request #5566 synchronize by Oyu07
January 27, 2024 00:16 13s
January 27, 2024 00:16 13s
Green Beret sprite fix Check for merge conflicts #19037: Pull request #5566 opened by Oyu07
January 27, 2024 00:16 13s
January 27, 2024 00:16 13s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19036: Pull request #5458 synchronize by LC4492
January 26, 2024 20:48 11s
January 26, 2024 20:48 11s
Deadchat no longer gets notified about tutorial facehuggers (#5546) Check for merge conflicts #19035: Commit a6f732c pushed by github-merge-queue bot
January 26, 2024 20:23 4m 13s master
master
January 26, 2024 20:23 4m 13s
Fixes xeno tunnel tracking (#5536) Check for merge conflicts #19034: Commit 7e13948 pushed by github-merge-queue bot
January 26, 2024 20:10 4m 19s master
master
January 26, 2024 20:10 4m 19s
Fixes edited .jsx files not triggering a TGUI recompile Check for merge conflicts #19033: Pull request #5562 opened by SabreML
January 26, 2024 17:58 11s
January 26, 2024 17:58 11s
Makes observers see the marine version of CAS warnings Check for merge conflicts #19032: Pull request #5561 opened by SabreML
January 26, 2024 14:02 13s
January 26, 2024 14:02 13s
updates sprite of intel chestrig Check for merge conflicts #19031: Pull request #5532 synchronize by PoltavskaPraca
January 26, 2024 10:39 13s
January 26, 2024 10:39 13s
UPP ERT Backstory Change Check for merge conflicts #19030: Pull request #5559 synchronize by CyberSpyXD
January 26, 2024 04:55 1m 56s
January 26, 2024 04:55 1m 56s