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
62 workflow runs
62 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Prison break virus update (#25491) Merge Conflict Detection #40: Commit 37189cd pushed by chuga-git
May 23, 2024 03:43 32s master
master
May 23, 2024 03:43 32s
Crashing into stuff while leaping will actually work now. (#25545) Merge Conflict Detection #39: Commit da36e9f pushed by chuga-git
May 21, 2024 21:37 29s master
master
May 21, 2024 21:37 29s
[TGUI] Noticeboard (#25095) Merge Conflict Detection #38: Commit 1409c03 pushed by chuga-git
May 17, 2024 21:06 32s master
master
May 17, 2024 21:06 32s
[S] Fixes a matter eater exploit (#25500) Merge Conflict Detection #37: Commit 52d8708 pushed by chuga-git
May 17, 2024 00:43 50s master
master
May 17, 2024 00:43 50s
Remove EMP spellbook from random pool (#25304) Merge Conflict Detection #36: Commit 2c2dc37 pushed by chuga-git
May 11, 2024 00:42 34s master
master
May 11, 2024 00:42 34s
Succesful heist (money resprite) (#25373) Merge Conflict Detection #35: Commit 3a5d0a1 pushed by chuga-git
May 7, 2024 23:15 38s master
master
May 7, 2024 23:15 38s
Merge Conflict Detection Merge Conflict Detection #34: Commit 409bcf8 pushed by chuga-git
May 6, 2024 01:09 33s master
master
May 6, 2024 01:09 33s
Merge Conflict Detection Merge Conflict Detection #33: Commit 7676a74 pushed by chuga-git
May 4, 2024 03:41 29s master
master
May 4, 2024 03:41 29s
cant_discount -> can_discount (#25366) Merge Conflict Detection #32: Commit 57db220 pushed by chuga-git
May 4, 2024 03:29 31s master
master
May 4, 2024 03:29 31s
Fixes being unable to move objects out of your way when stuck. (#25358) Merge Conflict Detection #31: Commit 67cab82 pushed by chuga-git
May 3, 2024 23:40 30s master
master
May 3, 2024 23:40 30s
Makes the Supermatter Announcements More Noticeable. (#25191) Merge Conflict Detection #30: Commit 3126eaf pushed by chuga-git
May 3, 2024 18:34 34s master
master
May 3, 2024 18:34 34s
Docs, small grammar fix (#25165) Merge Conflict Detection #29: Commit 57606c0 pushed by chuga-git
April 17, 2024 19:35 38s master
master
April 17, 2024 19:35 38s