Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,633 workflow run results
10,633 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES TM Holder (v5) Check for merge conflicts #21903: Pull request #6039 synchronize by realforest2001
April 24, 2024 22:33 13s
April 24, 2024 22:33 13s
Project ARES: Lockdown System Check for merge conflicts #21902: Pull request #6173 synchronize by realforest2001
April 24, 2024 22:28 10s
April 24, 2024 22:28 10s
Isaac's Lament is so back baby!! (WIP) Check for merge conflicts #21901: Pull request #5961 synchronize by BadAtThisGame302
April 24, 2024 21:59 10s
April 24, 2024 21:59 10s
Falling Falcons: Paratroopers Edition Check for merge conflicts #21900: Pull request #6150 synchronize by ihatethisengine
April 24, 2024 21:44 14s
April 24, 2024 21:44 14s
Pill bottle coloring Check for merge conflicts #21899: Pull request #6190 synchronize by Git-Nivrak
April 24, 2024 21:23 12s
April 24, 2024 21:23 12s
Pill bottle coloring Check for merge conflicts #21898: Pull request #6190 ready_for_review by Git-Nivrak
April 24, 2024 20:49 10s
April 24, 2024 20:49 10s
Pill bottle coloring Check for merge conflicts #21897: Pull request #6190 synchronize by Git-Nivrak
April 24, 2024 20:49 13s
April 24, 2024 20:49 13s
More features and tweaks for broadcasting (#6115) Check for merge conflicts #21896: Commit 9512952 pushed by github-merge-queue bot
April 24, 2024 20:13 4m 14s master
master
April 24, 2024 20:13 4m 14s
Research xenomorph "dissections" Check for merge conflicts #21895: Pull request #6188 synchronize by kiVts
April 24, 2024 20:02 1m 56s
April 24, 2024 20:02 1m 56s
Hugger deletion checking in drone tutorial (#6179) Check for merge conflicts #21894: Commit c13a011 pushed by github-merge-queue bot
April 24, 2024 20:02 4m 13s master
master
April 24, 2024 20:02 4m 13s
Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Check for merge conflicts #21893: Pull request #6073 reopened by harryob
April 24, 2024 20:02 10s
April 24, 2024 20:02 10s
Project ARES: Fixes deleting flight logs. (#6186) Check for merge conflicts #21892: Commit 6bec1dd pushed by github-merge-queue bot
April 24, 2024 19:54 4m 15s master
master
April 24, 2024 19:54 4m 15s
Fixes spotlight breaking every time (#6184) Check for merge conflicts #21891: Commit cc1ba1d pushed by github-merge-queue bot
April 24, 2024 18:02 4m 18s master
master
April 24, 2024 18:02 4m 18s
Pill bottle coloring Check for merge conflicts #21890: Pull request #6190 opened by Git-Nivrak
April 24, 2024 12:03 2m 11s
April 24, 2024 12:03 2m 11s
Fixes M4RA misspell in ASRS menu Check for merge conflicts #21889: Pull request #6189 opened by realforest2001
April 24, 2024 10:27 16s
April 24, 2024 10:27 16s
(WIP) Yautja Weapon Gimmicks, Round Two Check for merge conflicts #21888: Pull request #5392 synchronize by realforest2001
April 24, 2024 10:21 12s
April 24, 2024 10:21 12s
Biosuit Updates Check for merge conflicts #21887: Pull request #5925 synchronize by realforest2001
April 24, 2024 10:20 18s
April 24, 2024 10:20 18s
Research xenomorph "dissections" Check for merge conflicts #21886: Pull request #6188 synchronize by kiVts
April 24, 2024 05:52 13s
April 24, 2024 05:52 13s
Research xenomorph "dissections" Check for merge conflicts #21885: Pull request #6188 opened by kiVts
April 24, 2024 05:49 12s
April 24, 2024 05:49 12s
UPP/CLF Combat Synth Presets (#6183) Check for merge conflicts #21884: Commit cba9817 pushed by github-merge-queue bot
April 24, 2024 04:10 4m 12s master
master
April 24, 2024 04:10 4m 12s
Smoke Flamer Check for merge conflicts #21883: Pull request #6146 ready_for_review by iloveloopers
April 24, 2024 03:36 10s
April 24, 2024 03:36 10s
Smoke Flamer Check for merge conflicts #21882: Pull request #6146 synchronize by iloveloopers
April 24, 2024 03:30 58s
April 24, 2024 03:30 58s
Smoke Flamer Check for merge conflicts #21881: Pull request #6146 synchronize by iloveloopers
April 24, 2024 03:30 1m 6s
April 24, 2024 03:30 1m 6s
Smoke Flamer Check for merge conflicts #21880: Pull request #6146 synchronize by iloveloopers
April 24, 2024 03:30 2m 17s
April 24, 2024 03:30 2m 17s
Smoke Flamer Check for merge conflicts #21879: Pull request #6146 synchronize by iloveloopers
April 24, 2024 03:30 2m 14s
April 24, 2024 03:30 2m 14s