Skip to content

Actions: ss220-space/Skyrat-tg

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
14 workflow run results
14 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Revert: Return old font Merge Conflict Detection #33: Commit a512dc1 pushed by Dimach
June 30, 2023 21:10 10s master220
master220
June 30, 2023 21:10 10s
Revert: Return old font Merge Conflict Detection #32: Commit 88b00f3 pushed by Dimach
June 30, 2023 19:53 11s master220
master220
June 30, 2023 19:53 11s
Revert: Return MS Serif font Merge Conflict Detection #31: Commit dcae64e pushed by Dimach
June 30, 2023 12:54 13s master220
master220
June 30, 2023 12:54 13s
Tweak: disable infect objective Merge Conflict Detection #30: Commit f22156a pushed by Dimach
June 30, 2023 11:56 13s master220
master220
June 30, 2023 11:56 13s
Tweak: disable infect objective Merge Conflict Detection #29: Commit 14a13b8 pushed by Dimach
June 27, 2023 07:05 14s master220
master220
June 27, 2023 07:05 14s
Fix: close http client in rust_g to prevent memory leak issue Merge Conflict Detection #28: Commit 12c263e pushed by Dimach
June 27, 2023 05:59 11s master220
master220
June 27, 2023 05:59 11s
Fix: close http client in rust_g to prevent memory leak issue Merge Conflict Detection #27: Commit d41dfdb pushed by Bizzonium
June 26, 2023 20:33 12s master220
master220
June 26, 2023 20:33 12s
Fix: player panel no longer available without R_ADMIN Merge Conflict Detection #26: Commit 74f7296 pushed by Dimach
June 26, 2023 06:28 10s master220
master220
June 26, 2023 06:28 10s
Fix: player panel no longer available without R_ADMIN Merge Conflict Detection #25: Commit 045defc pushed by Dimach
June 26, 2023 06:27 10s master220
master220
June 26, 2023 06:27 10s
Fix autocryo for aghosted players Merge Conflict Detection #24: Commit 6c41d24 pushed by Dimach
June 23, 2023 17:18 12s master220
master220
June 23, 2023 17:18 12s
Fix autocryo for aghosted players Merge Conflict Detection #23: Commit 9af5462 pushed by Dimach
June 22, 2023 06:41 12s master220
master220
June 22, 2023 06:41 12s
Fix autocryo for aghosted players Merge Conflict Detection #22: Commit 0e464f4 pushed by Dimach
June 21, 2023 23:34 11s master220
master220
June 21, 2023 23:34 11s
Revert "[MIRROR] Admin Library Moderation (in-game edition) [MDB IGNO… Merge Conflict Detection #21: Commit b48f624 pushed by Dimach
June 21, 2023 05:18 11s master220
master220
June 21, 2023 05:18 11s
Revert "[MIRROR] JSON Logging Take Two [MDB IGNORE] (#21329)" Merge Conflict Detection #20: Commit c7b0494 pushed by Dimach
June 21, 2023 05:11 11s master220
master220
June 21, 2023 05:11 11s