Skip to content

Actions: ss220-space/Skyrat-tg

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
38 workflow run results
38 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Disable tutorial Merge Conflict Detection #57: Commit ad15d1b pushed by Dimach
August 17, 2023 17:55 13s master220
master220
August 17, 2023 17:55 13s
Disable tutorial Merge Conflict Detection #56: Commit 5ce8dcd pushed by Dimach
August 17, 2023 17:52 12s master220
master220
August 17, 2023 17:52 12s
Add: kilo station Merge Conflict Detection #55: Commit ef0b496 pushed by Dimach
August 13, 2023 00:09 16s master220
master220
August 13, 2023 00:09 16s
Add: kilo station Merge Conflict Detection #54: Commit 9559cdd pushed by Dimach
August 11, 2023 19:56 13s master220
master220
August 11, 2023 19:56 13s
Add: kilo station Merge Conflict Detection #53: Commit f99851b pushed by Dimach
August 9, 2023 20:55 13s master220
master220
August 9, 2023 20:55 13s
Add: kilo station Merge Conflict Detection #52: Commit 4d1b762 pushed by Dimach
August 6, 2023 23:02 10s master220
master220
August 6, 2023 23:02 10s
Tweak: reduce pixel shift Merge Conflict Detection #51: Commit e02afb9 pushed by Dimach
August 6, 2023 22:47 10s master220
master220
August 6, 2023 22:47 10s
Revert dynamic config changes Merge Conflict Detection #50: Commit c0e0341 pushed by Dimach
August 2, 2023 14:40 13s master220
master220
August 2, 2023 14:40 13s
Tweak: combat mode toggles combat indicator automatically Merge Conflict Detection #49: Commit 6b0a159 pushed by Dimach
August 2, 2023 05:36 10s master220
master220
August 2, 2023 05:36 10s
Revert dynamic config changes Merge Conflict Detection #48: Commit 6c55d88 pushed by Dimach
July 26, 2023 20:57 10s master220
master220
July 26, 2023 20:57 10s
Tweak: allow vote for all maps Merge Conflict Detection #47: Commit 1f04272 pushed by Dimach
July 26, 2023 20:52 10s master220
master220
July 26, 2023 20:52 10s
Tweak: allow vote for all maps Merge Conflict Detection #46: Commit 83e1c03 pushed by Dimach
July 26, 2023 20:51 14s master220
master220
July 26, 2023 20:51 14s
Fix: rust_g CI deps and use MariaDB instead of Mysql (#23) Merge Conflict Detection #45: Commit 2a33032 pushed by Bizzonium
July 23, 2023 21:08 11s master220
master220
July 23, 2023 21:08 11s
Fix: rust_g CI deps and use MariaDB instead of Mysql Merge Conflict Detection #44: Pull request #23 synchronize by Bizzonium
July 23, 2023 20:49 12s
July 23, 2023 20:49 12s
Fix: rust_g CI deps and use MariaDB instead of Mysql Merge Conflict Detection #43: Pull request #23 opened by Bizzonium
July 23, 2023 20:41 2m 5s
July 23, 2023 20:41 2m 5s
Feat: add new 94 TTS voices from Witcher (27), Evil Islands (27), L4D… Merge Conflict Detection #42: Commit 59af72c pushed by Bizzonium
July 23, 2023 20:36 9s master220
master220
July 23, 2023 20:36 9s
Feat: add new 94 TTS voices from Witcher (27), Evil Islands (27), L4D (4), SpongeBob (4), Tiny Bunny (10), Dota 2 (13), STALKER (7), Warcraft 3 (1), Portal 2 (1) Merge Conflict Detection #41: Pull request #22 opened by Bizzonium
July 23, 2023 19:57 11s
July 23, 2023 19:57 11s
Revert: Return old font Merge Conflict Detection #40: Commit 498e563 pushed by Dimach
July 22, 2023 05:29 11s master220
master220
July 22, 2023 05:29 11s
Revert: Return old font Merge Conflict Detection #39: Commit 3e46991 pushed by Dimach
July 22, 2023 05:07 12s master220
master220
July 22, 2023 05:07 12s
Revert: Return old font Merge Conflict Detection #38: Commit a512dc1 pushed by Dimach
July 10, 2023 11:48 12s master220
master220
July 10, 2023 11:48 12s
Revert "Auxiliary commit to revert individual files from 5a1402271523… Merge Conflict Detection #37: Commit 1d6639d pushed by Dimach
July 10, 2023 11:45 9s master220
master220
July 10, 2023 11:45 9s
Revert: Return old font Merge Conflict Detection #36: Commit 3e46991 pushed by Dimach
July 10, 2023 10:58 13s master220
master220
July 10, 2023 10:58 13s
Config conflict fix Merge Conflict Detection #35: Commit edc67f0 pushed by Dimach
July 10, 2023 10:30 10s master220
master220
July 10, 2023 10:30 10s
Revert: Return old font Merge Conflict Detection #34: Commit 3e46991 pushed by Dimach
July 10, 2023 08:50 11s master220
master220
July 10, 2023 08:50 11s
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