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
13,449 workflow run results
13,449 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: New Map - Segmentstation Merge Conflict Detection #17701: Pull request #5896 synchronize by Vladisvell
December 7, 2024 11:11 10s
December 7, 2024 11:11 10s
add: New Map - Segmentstation Merge Conflict Detection #17700: Pull request #5896 synchronize by Vladisvell
December 7, 2024 11:09 10s
December 7, 2024 11:09 10s
add: New Map - Segmentstation Merge Conflict Detection #17699: Pull request #5896 synchronize by Vladisvell
December 7, 2024 11:06 1m 3s
December 7, 2024 11:06 1m 3s
add: New Map - Segmentstation Merge Conflict Detection #17698: Pull request #5896 synchronize by Vladisvell
December 7, 2024 11:04 10s
December 7, 2024 11:04 10s
add: New Map - Segmentstation Merge Conflict Detection #17697: Pull request #5896 synchronize by Vladisvell
December 7, 2024 11:03 2m 17s
December 7, 2024 11:03 2m 17s
bugfix: Resolves test errors for idlenpcpool (#6234) Merge Conflict Detection #17696: Commit f865651 pushed by Vladisvell
December 6, 2024 21:59 2m 12s master220
master220
December 6, 2024 21:59 2m 12s
bugfix: Resolves test errors for idlenpcpool Merge Conflict Detection #17695: Pull request #6234 opened by Vladisvell
December 6, 2024 21:59 4m 14s
December 6, 2024 21:59 4m 14s
add: request console cart in pda[bounty] Merge Conflict Detection #17694: Pull request #5990 synchronize by Vladisvell
December 6, 2024 21:25 59s
December 6, 2024 21:25 59s
bugfix: Camera console broken screen textures fix (#6233) Merge Conflict Detection #17693: Commit 709eae6 pushed by Vladisvell
December 6, 2024 21:22 4m 14s master220
master220
December 6, 2024 21:22 4m 14s
bugfix: Camera console broken screen textures fix Merge Conflict Detection #17692: Pull request #6233 opened by Vladisvell
December 6, 2024 21:22 3m 3s
December 6, 2024 21:22 3m 3s
bugfix: Nova disposal (#6230) Merge Conflict Detection #17691: Commit 4b4a336 pushed by Vladisvell
December 6, 2024 18:10 3m 52s master220
master220
December 6, 2024 18:10 3m 52s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17690: Pull request #6195 synchronize by Anorak2024
December 6, 2024 18:09 2m 16s
December 6, 2024 18:09 2m 16s
tweak: Decrease access tuner price to 15 tc (#6225) Merge Conflict Detection #17689: Commit a247005 pushed by Vladisvell
December 6, 2024 18:09 4m 13s master220
master220
December 6, 2024 18:09 4m 13s
tweak: thunderdome cooldown (#6227) Merge Conflict Detection #17688: Commit 8cee4aa pushed by Vladisvell
December 6, 2024 18:09 4m 16s master220
master220
December 6, 2024 18:09 4m 16s
add: New() -> Initialize() organs migration. (#6137) Merge Conflict Detection #17687: Commit 5973657 pushed by Vladisvell
December 6, 2024 17:54 4m 18s master220
master220
December 6, 2024 17:54 4m 18s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17686: Pull request #6195 synchronize by Anorak2024
December 6, 2024 17:34 12s
December 6, 2024 17:34 12s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17685: Pull request #6195 synchronize by Anorak2024
December 6, 2024 17:12 12s
December 6, 2024 17:12 12s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17684: Pull request #6195 synchronize by Anorak2024
December 6, 2024 16:57 13s
December 6, 2024 16:57 13s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17683: Pull request #6195 ready_for_review by Anorak2024
December 6, 2024 16:09 15s
December 6, 2024 16:09 15s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17682: Pull request #6195 synchronize by Anorak2024
December 6, 2024 16:09 12s
December 6, 2024 16:09 12s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17681: Pull request #6168 synchronize by oi98
December 6, 2024 14:44 14s
December 6, 2024 14:44 14s
bugfix: Syndie supply pad console withdraw Merge Conflict Detection #17680: Pull request #6232 synchronize by Samirakis
December 6, 2024 14:23 16s
December 6, 2024 14:23 16s
bugfix: Syndie supply pad console withdraw Merge Conflict Detection #17679: Pull request #6232 opened by Samirakis
December 6, 2024 12:28 14s
December 6, 2024 12:28 14s
bugfix: removes solar control duping (#6231) Merge Conflict Detection #17678: Commit 5822373 pushed by Vladisvell
December 6, 2024 09:43 2m 12s master220
master220
December 6, 2024 09:43 2m 12s
bugfix: removes solar control duping Merge Conflict Detection #17677: Pull request #6231 opened by Vladisvell
December 6, 2024 09:43 4m 13s
December 6, 2024 09:43 4m 13s