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
11,472 workflow run results
11,472 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

delete: unathi rumble is gone Merge Conflict Detection #16384: Pull request #6030 synchronize by NightDawnFox
October 15, 2024 10:41 10s
October 15, 2024 10:41 10s
delete: unathi rumble is gone Merge Conflict Detection #16383: Pull request #6030 opened by NightDawnFox
October 15, 2024 10:38 17s
October 15, 2024 10:38 17s
imageadd: SP-91-RC - new sprites (#6026) Merge Conflict Detection #16382: Commit 91f57a5 pushed by github-merge-queue bot
October 15, 2024 07:35 2m 16s master220
master220
October 15, 2024 07:35 2m 16s
refactor: Now wiki comes from config and not hardcoded. (#5983) Merge Conflict Detection #16381: Commit 74727ba pushed by github-merge-queue bot
October 15, 2024 07:30 3m 0s master220
master220
October 15, 2024 07:30 3m 0s
tweak: decreased speed of vehicles (#6022) Merge Conflict Detection #16380: Commit 189939a pushed by github-merge-queue bot
October 15, 2024 07:30 2m 27s master220
master220
October 15, 2024 07:30 2m 27s
bugfix: no more multiple tipping (#6027) Merge Conflict Detection #16379: Commit 6b46b70 pushed by github-merge-queue bot
October 15, 2024 07:27 2m 46s master220
master220
October 15, 2024 07:27 2m 46s
bugfix: holoparasites are no longer can be refreshed in colossus crys… Merge Conflict Detection #16378: Commit 9267520 pushed by github-merge-queue bot
October 15, 2024 07:27 2m 57s master220
master220
October 15, 2024 07:27 2m 57s
feat: Повязки на глаза с ХУДом. Merge Conflict Detection #16377: Pull request #6010 synchronize by Etrnlmelancholy
October 15, 2024 07:18 10s
October 15, 2024 07:18 10s
feat: Повязки на глаза с ХУДом. Merge Conflict Detection #16376: Pull request #6010 synchronize by Etrnlmelancholy
October 15, 2024 07:16 12s
October 15, 2024 07:16 12s
add: midround space wizards! Merge Conflict Detection #16375: Pull request #6023 synchronize by NightDawnFox
October 15, 2024 06:41 10s
October 15, 2024 06:41 10s
add: midround space wizards! Merge Conflict Detection #16374: Pull request #6023 synchronize by NightDawnFox
October 15, 2024 06:39 9s
October 15, 2024 06:39 9s
add: vampire sucking effects Merge Conflict Detection #16373: Pull request #6029 opened by Anorak2024
October 15, 2024 06:31 11s
October 15, 2024 06:31 11s
bugfix: holoparasites are no longer can be refreshed in colossus crystal Merge Conflict Detection #16372: Pull request #6028 opened by NightDawnFox
October 15, 2024 06:17 16s
October 15, 2024 06:17 16s
bugfix: no more multiple tipping Merge Conflict Detection #16371: Pull request #6027 opened by NightDawnFox
October 15, 2024 06:09 14s
October 15, 2024 06:09 14s
bugfix: Brains in mmi can cast spells (#6021) Merge Conflict Detection #16370: Commit 65b703f pushed by github-merge-queue bot
October 15, 2024 06:02 2m 11s master220
master220
October 15, 2024 06:02 2m 11s
add: more objectives for vampires and clings (#6024) Merge Conflict Detection #16369: Commit 9372687 pushed by github-merge-queue bot
October 15, 2024 05:58 2m 15s master220
master220
October 15, 2024 05:58 2m 15s
imageadd: SP-91-RC - new sprites Merge Conflict Detection #16368: Pull request #6026 opened by PlayerUnknown14
October 15, 2024 02:54 23s
October 15, 2024 02:54 23s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16367: Pull request #5993 synchronize by Anorak2024
October 14, 2024 20:02 12s
October 14, 2024 20:02 12s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16366: Pull request #5993 synchronize by Anorak2024
October 14, 2024 19:48 15s
October 14, 2024 19:48 15s
tweak: decreased speed of vehicles Merge Conflict Detection #16365: Pull request #6022 synchronize by Den109G
October 14, 2024 19:24 13s
October 14, 2024 19:24 13s
add: more objectives for vampires and clings Merge Conflict Detection #16364: Pull request #6024 synchronize by Anorak2024
October 14, 2024 18:50 11s
October 14, 2024 18:50 11s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16363: Pull request #5993 synchronize by Anorak2024
October 14, 2024 18:35 12s
October 14, 2024 18:35 12s
add: Experimentor relics rework Merge Conflict Detection #16362: Pull request #5683 synchronize by Anorak2024
October 14, 2024 18:07 14s
October 14, 2024 18:07 14s
add: more objectives for vampires and clings Merge Conflict Detection #16361: Pull request #6024 opened by Anorak2024
October 14, 2024 18:00 15s
October 14, 2024 18:00 15s
add: midround space wizards! Merge Conflict Detection #16360: Pull request #6023 synchronize by NightDawnFox
October 14, 2024 17:47 11s
October 14, 2024 17:47 11s