Skip to content

Actions: chuga-git/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
63 workflow runs
63 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix timezones for round log filenames (#29446) Merge Conflict Detection #89: Commit 8187333 pushed by chuga-git
May 26, 2025 21:54 24s master
master
May 26, 2025 21:54 24s
fix runtime in grill (#29437) Merge Conflict Detection #88: Commit 067d925 pushed by chuga-git
May 25, 2025 23:41 25s master
master
May 25, 2025 23:41 25s
Grants the white ship submaps (#29140) Merge Conflict Detection #87: Commit bb94eae pushed by chuga-git
May 22, 2025 03:16 24s master
master
May 22, 2025 03:16 24s
refactor is_blocked_turf (#29324) Merge Conflict Detection #86: Commit 45e88ff pushed by chuga-git
May 21, 2025 21:26 27s master
master
May 21, 2025 21:26 27s
fix porrta turrets not working and runtiming every time they try to s… Merge Conflict Detection #85: Commit e8acea3 pushed by chuga-git
May 20, 2025 06:36 26s master
master
May 20, 2025 06:36 26s
Adds lens functionality to turrets (#29039) Merge Conflict Detection #84: Commit 30e1a5d pushed by chuga-git
May 19, 2025 11:06 25s master
master
May 19, 2025 11:06 25s
why does this issue haunt us forever (#29359) Merge Conflict Detection #83: Commit f80f1af pushed by chuga-git
May 17, 2025 22:38 25s master
master
May 17, 2025 22:38 25s
fix space sectors leading to lavaland (#28856) Merge Conflict Detection #82: Commit 0524d91 pushed by chuga-git
March 31, 2025 00:56 38s master
master
March 31, 2025 00:56 38s
NanoMap Auto-Update (Mon Mar 17 01:45:52 UTC 2025) (#28687) Merge Conflict Detection #81: Commit 31fbb9a pushed by chuga-git
March 17, 2025 22:01 32s master
master
March 17, 2025 22:01 32s
[READY] RUSTG Update (#28591) Merge Conflict Detection #80: Commit ec77853 pushed by chuga-git
March 9, 2025 23:16 30s master
master
March 9, 2025 23:16 30s
Make rust panic handler log panic payload (#28527) Merge Conflict Detection #79: Commit 86dd0ce pushed by chuga-git
March 4, 2025 16:55 36s master
master
March 4, 2025 16:55 36s
god damn it Merge Conflict Detection #78: Commit 4b086a1 pushed by chuga-git
March 4, 2025 06:25 42s master
master
March 4, 2025 06:25 42s
oopsies Merge Conflict Detection #77: Commit db0c709 pushed by chuga-git
March 4, 2025 06:22 38s master
master
March 4, 2025 06:22 38s
merges check_icon_conflicts and check_icon_dupenames into check_icons.py Merge Conflict Detection #76: Commit 128262d pushed by chuga-git
March 4, 2025 06:16 31s master
master
March 4, 2025 06:16 31s
Make rust panic handler log panic payload (#28527) Merge Conflict Detection #75: Commit 86dd0ce pushed by chuga-git
March 4, 2025 01:23 28s master
master
March 4, 2025 01:23 28s
Revert "progress" Merge Conflict Detection #74: Commit 2f77631 pushed by chuga-git
March 3, 2025 05:52 33s master
master
March 3, 2025 05:52 33s
Merge branch 'cant-stop-me-now' Merge Conflict Detection #73: Commit f719ff9 pushed by chuga-git
March 3, 2025 05:49 33s master
master
March 3, 2025 05:49 33s
refactors check_grep2.py to use ProcessPoolExecutor (#28574) Merge Conflict Detection #72: Commit 4947225 pushed by chuga-git
March 3, 2025 05:46 29s master
master
March 3, 2025 05:46 29s
Radiation Rework (#28320) Merge Conflict Detection #71: Commit ebf7fdb pushed by chuga-git
March 2, 2025 23:05 35s master
master
March 2, 2025 23:05 35s
Merge pull request #6 from chuga-git/need-for-speed Merge Conflict Detection #70: Commit 61c54af pushed by chuga-git
March 2, 2025 21:18 28s master
master
March 2, 2025 21:18 28s
[LORE] Updates a bunch of manual summaries (#28347) Merge Conflict Detection #69: Commit 0434d8f pushed by chuga-git
March 2, 2025 19:50 33s master
master
March 2, 2025 19:50 33s
Emagman buff (#28460) Merge Conflict Detection #68: Commit 47a89d5 pushed by chuga-git
February 26, 2025 19:26 31s master
master
February 26, 2025 19:26 31s
Adds linters (#28396) Merge Conflict Detection #67: Commit ec8d070 pushed by chuga-git
February 20, 2025 21:38 29s master
master
February 20, 2025 21:38 29s
Update ores.dm (#28422) Merge Conflict Detection #66: Commit 8c35714 pushed by chuga-git
February 17, 2025 01:24 31s master
master
February 17, 2025 01:24 31s
don't let mice chew through cables in map tests (#28395) Merge Conflict Detection #65: Commit 553601f pushed by chuga-git
February 14, 2025 20:22 31s master
master
February 14, 2025 20:22 31s