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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] Check for merge conflicts #20026: Pull request #5697 synchronize by PhantomEpicness
February 25, 2024 02:39 12s
February 25, 2024 02:39 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20025: Pull request #5784 ready_for_review by GrrrKitten
February 25, 2024 02:33 11s
February 25, 2024 02:33 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20024: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:32 12s
February 25, 2024 02:32 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20023: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:28 12s
February 25, 2024 02:28 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20022: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:11 11s
February 25, 2024 02:11 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20021: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:11 11s
February 25, 2024 02:11 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20020: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:48 12s
February 25, 2024 01:48 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20019: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:12 13s
February 25, 2024 01:12 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20018: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:11 2m 13s
February 25, 2024 01:11 2m 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20017: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:07 10s
February 25, 2024 01:07 10s
Brig Area Update/Refactor Check for merge conflicts #20016: Pull request #5723 synchronize by ItsVyzo
February 24, 2024 22:48 12s
February 24, 2024 22:48 12s
Another good Sprite PR Check for merge conflicts #20015: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:47 10s
February 24, 2024 21:47 10s
Another good Sprite PR Check for merge conflicts #20014: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:46 9s
February 24, 2024 21:46 9s
Another good Sprite PR Check for merge conflicts #20013: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:42 10s
February 24, 2024 21:42 10s
Another good Sprite PR Check for merge conflicts #20012: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:30 11s
February 24, 2024 21:30 11s
The Corpsening Check for merge conflicts #20011: Pull request #5805 opened by BadAtThisGame302
February 24, 2024 21:27 10s
February 24, 2024 21:27 10s
ports lazy templates, uses them for ert stations. distress beacons now start in transit to the ship, and return to their very own ert home Check for merge conflicts #20010: Pull request #5802 synchronize by harryob
February 24, 2024 21:18 10s
February 24, 2024 21:18 10s
(Slightly) Less confusing failure message for built-in visors Check for merge conflicts #20009: Pull request #5804 opened by SabreML
February 24, 2024 21:02 2m 11s
February 24, 2024 21:02 2m 11s
Small auto-observe fixes (#5788) Check for merge conflicts #20008: Commit bab9f86 pushed by github-merge-queue bot
February 24, 2024 21:00 2m 14s master
master
February 24, 2024 21:00 2m 14s
speeds up ci runs by 3 minutes Check for merge conflicts #20007: Pull request #5803 opened by harryob
February 24, 2024 20:50 3m 44s
February 24, 2024 20:50 3m 44s
Barricades Multi-Weld Revert & Refactoring (#5795) Check for merge conflicts #20006: Commit 4546ee0 pushed by github-merge-queue bot
February 24, 2024 20:42 2m 12s master
master
February 24, 2024 20:42 2m 12s
ports lazy templates, uses them for ert stations. distress beacons now start in transit to the ship, and return to their very own ert home Check for merge conflicts #20005: Pull request #5802 synchronize by harryob
February 24, 2024 20:34 2m 21s
February 24, 2024 20:34 2m 21s
ports lazy templates, uses them for ert stations. distress beacons now start in transit to the ship, and return to their very own ert home Check for merge conflicts #20004: Pull request #5802 opened by harryob
February 24, 2024 20:32 3m 10s
February 24, 2024 20:32 3m 10s
Refactor marine_armor.dm and split it into multiples files. (#5740) Check for merge conflicts #20003: Commit 747b74d pushed by github-merge-queue bot
February 24, 2024 20:29 4m 25s master
master
February 24, 2024 20:29 4m 25s
Reenables Prison station Check for merge conflicts #20002: Pull request #5801 opened by Greg-Joffer
February 24, 2024 19:54 9s
February 24, 2024 19:54 9s