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

bugfix: Nova disposal Merge Conflict Detection #17676: Pull request #6230 opened by PiroMage
December 5, 2024 18:36 13s
December 5, 2024 18:36 13s
balance: borers punish host action buff Merge Conflict Detection #17675: Pull request #6228 synchronize by Anorak2024
December 5, 2024 16:29 16s
December 5, 2024 16:29 16s
add: Sound, new spite, translation for SM Merge Conflict Detection #17674: Pull request #6154 synchronize by Rafnik02
December 5, 2024 14:55 25s
December 5, 2024 14:55 25s
add: Sound, new spite, translation for SM Merge Conflict Detection #17673: Pull request #6154 synchronize by Rafnik02
December 5, 2024 14:53 14s
December 5, 2024 14:53 14s
add: Sound, new spite, translation for SM Merge Conflict Detection #17672: Pull request #6154 synchronize by Rafnik02
December 5, 2024 14:45 14s
December 5, 2024 14:45 14s
add: request console cart in pda[bounty] Merge Conflict Detection #17671: Pull request #5990 synchronize by Vladisvell
December 5, 2024 13:42 19s
December 5, 2024 13:42 19s
[TESTMERGE] Disables projectile logs Merge Conflict Detection #17670: Pull request #6229 opened by Vladisvell
December 5, 2024 13:40 12s
December 5, 2024 13:40 12s
add: Sound, new spite, translation for SM Merge Conflict Detection #17669: Pull request #6154 synchronize by Antoonij
December 5, 2024 13:13 19s
December 5, 2024 13:13 19s
balance: borers punish host action buff Merge Conflict Detection #17668: Pull request #6228 opened by Anorak2024
December 5, 2024 13:13 13s
December 5, 2024 13:13 13s
translation: vending.dm (#6174) Merge Conflict Detection #17667: Commit a5f07fa pushed by github-merge-queue bot
December 5, 2024 12:02 4m 18s master220
master220
December 5, 2024 12:02 4m 18s
qol: medical equipment translation Merge Conflict Detection #17666: Pull request #6172 synchronize by PlayerUnknown14
December 5, 2024 11:57 13s
December 5, 2024 11:57 13s
translation: vending.dm Merge Conflict Detection #17665: Pull request #6174 synchronize by Antoonij
December 5, 2024 06:45 15s
December 5, 2024 06:45 15s
translation: vending.dm Merge Conflict Detection #17664: Pull request #6174 synchronize by Antoonij
December 5, 2024 06:44 2m 14s
December 5, 2024 06:44 2m 14s
add: fishing Merge Conflict Detection #17663: Pull request #6150 synchronize by NightDawnFox
December 4, 2024 18:46 18s
December 4, 2024 18:46 18s
qol: medical equipment translation Merge Conflict Detection #17662: Pull request #6172 synchronize by PlayerUnknown14
December 4, 2024 15:47 12s
December 4, 2024 15:47 12s
tweak: thunderdome cooldown Merge Conflict Detection #17661: Pull request #6227 opened by PlayerUnknown14
December 4, 2024 03:02 2m 23s
December 4, 2024 03:02 2m 23s
imageadd: sec_autolathe appdate spr Merge Conflict Detection #17660: Pull request #6226 synchronize by pilygun
December 3, 2024 17:31 14s
December 3, 2024 17:31 14s
imageadd: sec_autolathe appdate spr Merge Conflict Detection #17659: Pull request #6226 opened by pilygun
December 3, 2024 17:30 14s
December 3, 2024 17:30 14s
tweak: Decrease access tuner price to 15 tc Merge Conflict Detection #17658: Pull request #6225 synchronize by pilygun
December 3, 2024 16:38 12s
December 3, 2024 16:38 12s
tweak: Decrease access tuner price to 15 tc Merge Conflict Detection #17657: Pull request #6225 opened by pilygun
December 3, 2024 16:37 19s
December 3, 2024 16:37 19s
translation: brig cells and computer Merge Conflict Detection #17656: Pull request #6224 synchronize by syndicatecat
December 3, 2024 12:31 10s
December 3, 2024 12:31 10s
translation: brig cells and computer Merge Conflict Detection #17655: Pull request #6224 opened by syndicatecat
December 3, 2024 12:15 2m 15s
December 3, 2024 12:15 2m 15s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17654: Pull request #6195 synchronize by Anorak2024
December 2, 2024 18:09 45s
December 2, 2024 18:09 45s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17653: Pull request #6195 synchronize by Anorak2024
December 2, 2024 18:08 13s
December 2, 2024 18:08 13s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17652: Pull request #6195 synchronize by Anorak2024
December 2, 2024 18:08 13s
December 2, 2024 18:08 13s