Skip to content

Actions: ss220-space/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
435 workflow run results
435 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: akula plushie Merge Conflict Detection #4888: Pull request #3756 synchronize by Daeberdir
October 22, 2023 15:09 16s
October 22, 2023 15:09 16s
add: akula plushie Merge Conflict Detection #4887: Pull request #3756 synchronize by Daeberdir
October 22, 2023 14:15 14s
October 22, 2023 14:15 14s
add: akula plushie Merge Conflict Detection #4886: Pull request #3756 opened by Daeberdir
October 22, 2023 13:04 13s
October 22, 2023 13:04 13s
bugfix: T-rays can now see hiden safes. Merge Conflict Detection #4885: Pull request #3755 synchronize by Daeberdir
October 22, 2023 12:52 15s
October 22, 2023 12:52 15s
bugfix: T-rays can now see hiden safes. Merge Conflict Detection #4884: Pull request #3755 synchronize by Daeberdir
October 22, 2023 09:24 12s
October 22, 2023 09:24 12s
bugfix: T-rays can now see hiden safes. Merge Conflict Detection #4883: Pull request #3755 opened by Daeberdir
October 22, 2023 08:29 11s
October 22, 2023 08:29 11s
bugfix: bananapeels makes you laugh normally. Merge Conflict Detection #4882: Pull request #3754 opened by Daeberdir
October 22, 2023 07:00 13s
October 22, 2023 07:00 13s
bugfix: Malf AI Destroy Datum Fix (#3752) Merge Conflict Detection #4881: Commit 5a9d9a9 pushed by Dimach
October 22, 2023 06:17 2m 21s master220
master220
October 22, 2023 06:17 2m 21s
refactor: Throwing Refactor And Delayed Bolas Merge Conflict Detection #4880: Pull request #3685 synchronize by Gottfrei
October 21, 2023 22:23 12s
October 21, 2023 22:23 12s
refactor: Throwing Refactor And Delayed Bolas Merge Conflict Detection #4879: Pull request #3685 synchronize by Gottfrei
October 21, 2023 22:21 10s
October 21, 2023 22:21 10s
add: Shadow Demon Merge Conflict Detection #4878: Pull request #3616 synchronize by Gottfrei
October 21, 2023 22:15 14s
October 21, 2023 22:15 14s
add: Added and reworked Plasmaman Envirosuits sprites Merge Conflict Detection #4877: Pull request #3753 opened by Vladisvell
October 21, 2023 20:01 17s
October 21, 2023 20:01 17s
bugfix: Malf AI Destroy Datum Fix Merge Conflict Detection #4876: Pull request #3752 opened by Gottfrei
October 21, 2023 17:54 14s
October 21, 2023 17:54 14s
Suragi Jackets 1.1 Patch Merge Conflict Detection #4875: Pull request #3750 synchronize by XaycBC
October 21, 2023 17:29 11s
October 21, 2023 17:29 11s
Suragi Jackets 1.1 Patch Merge Conflict Detection #4874: Pull request #3750 synchronize by XaycBC
October 21, 2023 17:23 12s
October 21, 2023 17:23 12s
Automatic changelog generation Merge Conflict Detection #4873: Commit 7df2c3f pushed by changelog-bot bot
October 21, 2023 16:23 2m 18s master220
master220
October 21, 2023 16:23 2m 18s
tweak: Shadowling Glare Autotarget (#3730) Merge Conflict Detection #4872: Commit 0c25c81 pushed by Dimach
October 21, 2023 16:20 2m 13s master220
master220
October 21, 2023 16:20 2m 13s
add: frag grenade for traitors (#3727) Merge Conflict Detection #4871: Commit cb7f92a pushed by Dimach
October 21, 2023 16:20 2m 14s master220
master220
October 21, 2023 16:20 2m 14s
bugfix: lavaland clown dome set lava base turf (#3736) Merge Conflict Detection #4870: Commit db58d9f pushed by Dimach
October 21, 2023 16:19 2m 18s master220
master220
October 21, 2023 16:19 2m 18s
bugfix: ticket machine button works (#3735) Merge Conflict Detection #4869: Commit 73556cf pushed by Dimach
October 21, 2023 16:18 2m 14s master220
master220
October 21, 2023 16:18 2m 14s
tweak: MA combo steps explain_text. (#3734) Merge Conflict Detection #4868: Commit 6d931c2 pushed by Dimach
October 21, 2023 16:17 2m 19s master220
master220
October 21, 2023 16:17 2m 19s
soundadd: revolvers (#3740) Merge Conflict Detection #4867: Commit 89299b6 pushed by Dimach
October 21, 2023 15:42 2m 18s master220
master220
October 21, 2023 15:42 2m 18s
fix: wrong-mantisblades-sprite (#3741) Merge Conflict Detection #4866: Commit 9682c85 pushed by Dimach
October 21, 2023 15:41 2m 20s master220
master220
October 21, 2023 15:41 2m 20s
bugfix: now random item picking from uplink is working correctly (#3731) Merge Conflict Detection #4865: Commit 17b889a pushed by Dimach
October 21, 2023 15:31 2m 16s master220
master220
October 21, 2023 15:31 2m 16s
bugfix: Get Temperature Fix (#3732) Merge Conflict Detection #4864: Commit a6febca pushed by Dimach
October 21, 2023 15:31 2m 13s master220
master220
October 21, 2023 15:31 2m 13s
ProTip! You can narrow down the results and go further in time using created:<2023-10-21 or the other filters available.