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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17651: Pull request #6195 synchronize by Anorak2024
December 2, 2024 18:04 16s
December 2, 2024 18:04 16s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17650: Pull request #6168 synchronize by oi98
December 2, 2024 15:37 20s
December 2, 2024 15:37 20s
tweak: tribal armor buff Merge Conflict Detection #17649: Pull request #6218 synchronize by PlayerUnknown14
December 2, 2024 14:11 13s
December 2, 2024 14:11 13s
qol: medical equipment translation Merge Conflict Detection #17648: Pull request #6172 synchronize by PlayerUnknown14
December 2, 2024 13:53 16s
December 2, 2024 13:53 16s
qol: robots translation (#6130) Merge Conflict Detection #17647: Commit 902cbf2 pushed by github-merge-queue bot
December 2, 2024 12:07 4m 16s master220
master220
December 2, 2024 12:07 4m 16s
add: fishing Merge Conflict Detection #17646: Pull request #6150 synchronize by NightDawnFox
December 2, 2024 07:10 12s
December 2, 2024 07:10 12s
qol: medical equipment translation Merge Conflict Detection #17645: Pull request #6172 ready_for_review by PlayerUnknown14
December 2, 2024 06:47 11s
December 2, 2024 06:47 11s
qol: medical equipment translation Merge Conflict Detection #17644: Pull request #6172 synchronize by PlayerUnknown14
December 2, 2024 06:30 11s
December 2, 2024 06:30 11s
tweak: tribal armor buff Merge Conflict Detection #17643: Pull request #6218 synchronize by PlayerUnknown14
December 2, 2024 05:54 14s
December 2, 2024 05:54 14s
tweak: tribal armor buff Merge Conflict Detection #17642: Pull request #6218 synchronize by PlayerUnknown14
December 2, 2024 05:44 11s
December 2, 2024 05:44 11s
qol: medical equipment translation Merge Conflict Detection #17641: Pull request #6172 synchronize by PlayerUnknown14
December 2, 2024 03:42 2m 13s
December 2, 2024 03:42 2m 13s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17640: Pull request #6195 synchronize by Anorak2024
December 1, 2024 17:56 14s
December 1, 2024 17:56 14s
add: request console cart in pda[bounty] Merge Conflict Detection #17639: Pull request #5990 synchronize by Vladisvell
December 1, 2024 15:39 16s
December 1, 2024 15:39 16s
qol: medical equipment translation Merge Conflict Detection #17638: Pull request #6172 synchronize by PlayerUnknown14
December 1, 2024 10:44 10s
December 1, 2024 10:44 10s
qol: medical equipment translation Merge Conflict Detection #17637: Pull request #6172 synchronize by PlayerUnknown14
December 1, 2024 10:43 12s
December 1, 2024 10:43 12s
qol: medical equipment translation Merge Conflict Detection #17636: Pull request #6172 synchronize by PlayerUnknown14
December 1, 2024 04:41 2m 14s
December 1, 2024 04:41 2m 14s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17635: Pull request #6195 synchronize by Anorak2024
November 30, 2024 18:26 15s
November 30, 2024 18:26 15s
rework/add/перевод/refactor/balance: Anomalies update Merge Conflict Detection #17634: Pull request #6195 synchronize by Anorak2024
November 30, 2024 18:26 11s
November 30, 2024 18:26 11s
Ивент "Сбойный ИИ" Merge Conflict Detection #17633: Pull request #6199 synchronize by Ravgolin
November 30, 2024 13:29 11s
November 30, 2024 13:29 11s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17632: Pull request #6168 synchronize by oi98
November 30, 2024 12:36 16s
November 30, 2024 12:36 16s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17631: Pull request #6168 synchronize by oi98
November 30, 2024 12:16 15s
November 30, 2024 12:16 15s
add: fishing Merge Conflict Detection #17630: Pull request #6150 synchronize by NightDawnFox
November 30, 2024 06:10 2m 12s
November 30, 2024 06:10 2m 12s
qol: medical equipment translation Merge Conflict Detection #17629: Pull request #6172 synchronize by PlayerUnknown14
November 29, 2024 15:52 12s
November 29, 2024 15:52 12s
tweak: aiming lying targets by changing intent Merge Conflict Detection #17628: Pull request #6222 synchronize by LiquidPotroh
November 29, 2024 13:36 12s
November 29, 2024 13:36 12s
refactor: reagent attacks & Unarmed attacks Merge Conflict Detection #17627: Pull request #5926 synchronize by Antoonij
November 29, 2024 12:47 17s
November 29, 2024 12:47 17s