Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Mapping disk smartfridges (#8343) Check for merge conflicts #1454: Commit c59ba42 pushed by hyperioo
October 27, 2023 16:55 58s master
master
October 27, 2023 16:55 58s
New mid-threat antag: Pirates (#8340) Check for merge conflicts #1453: Commit 4b7e693 pushed by hyperioo
October 20, 2023 17:07 1m 2s master
master
October 20, 2023 17:07 1m 2s
Add K.A.R.L mining tool (#8339) Check for merge conflicts #1452: Commit 4de81c8 pushed by hyperioo
October 20, 2023 17:05 57s master
master
October 20, 2023 17:05 57s
Sorter Room Disposal Chute Fix, Shipping Supplies (General Map PR) (#… Check for merge conflicts #1451: Commit 90569b8 pushed by hyperioo
October 20, 2023 17:04 1m 0s master
master
October 20, 2023 17:04 1m 0s
Prevent deep drill unwrenching during collapse (#8338) Check for merge conflicts #1450: Commit 7d0e625 pushed by hyperioo
October 20, 2023 17:02 1m 2s master
master
October 20, 2023 17:02 1m 2s
convert assembly-related UIs to TGUI (#8342) Check for merge conflicts #1449: Commit d624f0e pushed by hyperioo
October 20, 2023 17:02 1m 16s master
master
October 20, 2023 17:02 1m 16s
add vscode configuration for prettier (#8341) Check for merge conflicts #1448: Commit 0ba0462 pushed by hyperioo
October 20, 2023 16:58 54s master
master
October 20, 2023 16:58 54s
Loads of Sprite Improvements (#8333) Check for merge conflicts #1447: Commit e7ca418 pushed by hyperioo
October 13, 2023 17:26 56s master
master
October 13, 2023 17:26 56s