Skip to content

Actions: ss220-space/Skyrat-tg

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
71 workflow run results
71 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cat type refactor Merge Conflict Detection #109: Commit 95488d4 pushed by Dimach
December 5, 2023 23:20 7m 32s master220
master220
December 5, 2023 23:20 7m 32s
Cat type refactor Merge Conflict Detection #108: Commit 0f36136 pushed by Dimach
December 5, 2023 23:17 18s master220
master220
December 5, 2023 23:17 18s
Update kilostation Merge Conflict Detection #107: Commit b800685 pushed by Dimach
December 5, 2023 23:15 10s master220
master220
December 5, 2023 23:15 10s
Update kilostation Merge Conflict Detection #106: Commit b41d3e3 pushed by Dimach
December 5, 2023 23:05 12s master220
master220
December 5, 2023 23:05 12s
Update kilostation Merge Conflict Detection #105: Commit b06b6d7 pushed by Dimach
November 28, 2023 03:40 10s master220
master220
November 28, 2023 03:40 10s
Update kilostation Merge Conflict Detection #104: Commit deb25f1 pushed by Dimach
November 28, 2023 03:30 11s master220
master220
November 28, 2023 03:30 11s
Update kilostation Merge Conflict Detection #103: Commit c7fea7f pushed by Dimach
November 24, 2023 19:30 12s master220
master220
November 24, 2023 19:30 12s
Simpleanimals Merge Conflict Detection #102: Commit 6064b8c pushed by Dimach
November 24, 2023 18:40 13s master220
master220
November 24, 2023 18:40 13s
Simplemobs refactor Merge Conflict Detection #101: Commit bab28e5 pushed by Dimach
November 24, 2023 18:19 12s master220
master220
November 24, 2023 18:19 12s
Simplemobs refactor Merge Conflict Detection #100: Commit 3935ced pushed by Dimach
November 22, 2023 22:07 12s master220
master220
November 22, 2023 22:07 12s
Fix: ban reason compute unicode chars correctly Merge Conflict Detection #99: Commit fa1b949 pushed by Dimach
November 22, 2023 21:49 13s master220
master220
November 22, 2023 21:49 13s
Fix: ban reason compute unicode chars correctly Merge Conflict Detection #98: Commit cab5660 pushed by Dimach
November 22, 2023 00:50 13s master220
master220
November 22, 2023 00:50 13s
Fix: ban reason compute unicode chars correctly Merge Conflict Detection #97: Commit 79772a7 pushed by Dimach
November 7, 2023 14:54 15s master220
master220
November 7, 2023 14:54 15s
Update refactors Merge Conflict Detection #96: Commit a11747c pushed by Dimach
October 25, 2023 16:38 11s master220
master220
October 25, 2023 16:38 11s
Fix simplemobs 2 Merge Conflict Detection #95: Commit e143022 pushed by Dimach
October 25, 2023 16:09 12s master220
master220
October 25, 2023 16:09 12s
Fix simplemobs 2 Merge Conflict Detection #94: Commit 020985a pushed by Dimach
October 11, 2023 08:56 12s master220
master220
October 11, 2023 08:56 12s
Fix respawn config Merge Conflict Detection #93: Commit 91a66fe pushed by Dimach
October 11, 2023 08:29 10s master220
master220
October 11, 2023 08:29 10s
Update kilo station Merge Conflict Detection #92: Commit a0b987a pushed by Dimach
October 11, 2023 08:20 15s master220
master220
October 11, 2023 08:20 15s
Update kilo station Merge Conflict Detection #91: Commit 023bd9b pushed by Dimach
October 11, 2023 08:05 13s master220
master220
October 11, 2023 08:05 13s
Fix simplemobs refactor Merge Conflict Detection #90: Commit 64b3446 pushed by Dimach
October 11, 2023 07:59 11s master220
master220
October 11, 2023 07:59 11s
add: EX666 discord emojis (#27) Merge Conflict Detection #89: Commit 1f94a75 pushed by Dimach
October 10, 2023 18:42 11m 56s master220
master220
October 10, 2023 18:42 11m 56s
add: EX666 discord emojis (#27) Merge Conflict Detection #88: Commit af7d5fb pushed by Dimach
October 10, 2023 18:39 11s master220
master220
October 10, 2023 18:39 11s
add: EX666 discord emojis Merge Conflict Detection #87: Pull request #27 synchronize by Dimach
October 10, 2023 18:38 14s
October 10, 2023 18:38 14s
add: EX666 discord emojis Merge Conflict Detection #86: Pull request #27 reopened by Dimach
October 10, 2023 18:38 15s
October 10, 2023 18:38 15s
Cleanup admins config Merge Conflict Detection #85: Commit 8a5429e pushed by Dimach
September 24, 2023 12:03 2m 11s master220
master220
September 24, 2023 12:03 2m 11s