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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Barricades Multi-Weld Revert & Refactoring Check for merge conflicts #19976: Pull request #5795 synchronize by Drulikar
February 23, 2024 23:46 13s
February 23, 2024 23:46 13s
Barricades Multi-Weld Revert & Refactoring Check for merge conflicts #19975: Pull request #5795 synchronize by Drulikar
February 23, 2024 23:36 11s
February 23, 2024 23:36 11s
Nightmare Insert Fixes & Elevated Nightmare Errors Check for merge conflicts #19974: Pull request #5796 opened by Drulikar
February 23, 2024 22:47 14s
February 23, 2024 22:47 14s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #19973: Pull request #5784 ready_for_review by Drulikar
February 23, 2024 22:02 10s
February 23, 2024 22:02 10s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #19972: Pull request #5784 synchronize by Drulikar
February 23, 2024 21:53 10s
February 23, 2024 21:53 10s
Barricades Multi-Weld Revert & Refactoring Check for merge conflicts #19971: Pull request #5795 opened by Drulikar
February 23, 2024 21:43 17s
February 23, 2024 21:43 17s
Adds a new Nightmare Insert on LV-624 (#5652) Check for merge conflicts #19970: Commit 6901693 pushed by github-merge-queue bot
February 23, 2024 20:44 4m 14s master
master
February 23, 2024 20:44 4m 14s
Fix for wound overlays. (#5787) Check for merge conflicts #19969: Commit b9ae5b4 pushed by github-merge-queue bot
February 23, 2024 20:31 4m 14s master
master
February 23, 2024 20:31 4m 14s
Fixes the 88 Mod 4's holster sprite (#5785) Check for merge conflicts #19968: Commit 861d5b8 pushed by github-merge-queue bot
February 23, 2024 20:18 4m 14s master
master
February 23, 2024 20:18 4m 14s
Check Ckey button. (#5786) Check for merge conflicts #19967: Commit 3e1c726 pushed by github-merge-queue bot
February 23, 2024 20:04 4m 15s master
master
February 23, 2024 20:04 4m 15s
Weyland Yutani Trading Cards™ (#5665) Check for merge conflicts #19966: Commit 772e5bf pushed by github-merge-queue bot
February 23, 2024 19:53 4m 13s master
master
February 23, 2024 19:53 4m 13s
Brig Area Update/Refactor Check for merge conflicts #19965: Pull request #5723 ready_for_review by ItsVyzo
February 23, 2024 19:49 9s
February 23, 2024 19:49 9s
Weyland Yutani Trading Cards™ Check for merge conflicts #19964: Pull request #5665 ready_for_review by Warfan1815
February 23, 2024 18:59 1m 3s
February 23, 2024 18:59 1m 3s
Weyland Yutani Trading Cards™ Check for merge conflicts #19963: Pull request #5665 synchronize by Warfan1815
February 23, 2024 18:59 30s
February 23, 2024 18:59 30s
Weyland Yutani Trading Cards™ Check for merge conflicts #19962: Pull request #5665 synchronize by Warfan1815
February 23, 2024 18:59 14s
February 23, 2024 18:59 14s
Relay Ping Browser Check for merge conflicts #19961: Pull request #5777 synchronize by Drulikar
February 23, 2024 17:01 12s
February 23, 2024 17:01 12s
Refactor marine_armor.dm and split it into multiples files. Check for merge conflicts #19960: Pull request #5740 synchronize by Huffie56
February 23, 2024 12:18 19s
February 23, 2024 12:18 19s
Automatic TGS DMAPI Update (#5789) Check for merge conflicts #19959: Commit d41da32 pushed by github-merge-queue bot
February 23, 2024 10:33 2m 14s master
master
February 23, 2024 10:33 2m 14s
MOPP Desc tism (#5782) Check for merge conflicts #19958: Commit 9e54a30 pushed by github-merge-queue bot
February 23, 2024 10:19 4m 18s master
master
February 23, 2024 10:19 4m 18s
Details LV624 secure storage blast area Check for merge conflicts #19957: Pull request #5794 opened by spartanbobby
February 23, 2024 02:14 10s
February 23, 2024 02:14 10s
Opens up 1x1 hellscape on kutjevo, removes ledges in combat zone Check for merge conflicts #19956: Pull request #5793 opened by spartanbobby
February 23, 2024 02:05 10s
February 23, 2024 02:05 10s
Changes to south yard Sci-annex Check for merge conflicts #19955: Pull request #5792 opened by spartanbobby
February 23, 2024 01:54 14s
February 23, 2024 01:54 14s
Details bigred Libary Check for merge conflicts #19954: Pull request #5791 synchronize by spartanbobby
February 23, 2024 01:32 11s
February 23, 2024 01:32 11s
Details bigred Libary Check for merge conflicts #19953: Pull request #5791 synchronize by spartanbobby
February 23, 2024 01:32 11s
February 23, 2024 01:32 11s
Details bigred Libary Check for merge conflicts #19952: Pull request #5791 opened by spartanbobby
February 23, 2024 01:30 2m 15s
February 23, 2024 01:30 2m 15s