Skip to content

Actions: Ssheya/Paradise

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
19 workflow runs
19 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

tweak: Оптимизация GetElement (#6552)
Merge Conflict Detection #19: Commit abae589 pushed by Ssheya
February 21, 2025 12:53 11s master220
February 21, 2025 12:53 11s
bugfix: admin communication console access fix (#6425)
Merge Conflict Detection #18: Commit 79d079c pushed by Ssheya
January 25, 2025 14:03 2m 15s master220
January 25, 2025 14:03 2m 15s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #17: Commit ccf575a pushed by Ssheya
January 25, 2025 13:58 2m 11s master220
January 25, 2025 13:58 2m 11s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #16: Commit 9a24663 pushed by Ssheya
January 25, 2025 13:37 2m 10s master220
January 25, 2025 13:37 2m 10s
ДА БЛЯЯЯЯЯЯЯЯЯЯЯЯЯТЬ
Merge Conflict Detection #15: Commit 4292e7e pushed by Ssheya
January 25, 2025 13:18 2m 9s master220
January 25, 2025 13:18 2m 9s
ты заебал
Merge Conflict Detection #14: Commit aed15de pushed by Ssheya
January 25, 2025 13:16 2m 11s master220
January 25, 2025 13:16 2m 11s
СЕ ИДИ НАХУЙ
Merge Conflict Detection #13: Commit 7341f93 pushed by Ssheya
January 25, 2025 13:14 2m 10s master220
January 25, 2025 13:14 2m 10s
NanoMap Auto-Update (Fri Oct 4 00:38:07 UTC 2024)
Merge Conflict Detection #12: Commit 82705f4 pushed by Ssheya
January 25, 2025 12:57 2m 15s master220
January 25, 2025 12:57 2m 15s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #11: Commit 2b9e3a8 pushed by Ssheya
January 25, 2025 12:55 2m 10s master220
January 25, 2025 12:55 2m 10s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #10: Commit 3bf3b6a pushed by Ssheya
December 31, 2024 19:47 9s master220
December 31, 2024 19:47 9s
bugfix: warning at sass/scss section for testmerge action (#6292)
Merge Conflict Detection #9: Commit f49c62d pushed by Ssheya
December 31, 2024 19:45 10s master220
December 31, 2024 19:45 10s
spellcheck: DNA effects translation (#6155)
Merge Conflict Detection #8: Commit 496d827 pushed by Ssheya
November 15, 2024 05:18 2m 11s master220
November 15, 2024 05:18 2m 11s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #7: Commit 0526665 pushed by Ssheya
November 2, 2024 01:04 2m 13s master220
November 2, 2024 01:04 2m 13s
Merge branch 'ss220-space:master220' into master220
Merge Conflict Detection #6: Commit 1d4003d pushed by Ssheya
November 2, 2024 01:02 2m 11s master220
November 2, 2024 01:02 2m 11s
Merge branch 'master220' of https://github.com/Ssheya/Paradise into m…
Merge Conflict Detection #5: Commit 9711ac5 pushed by Ssheya
October 18, 2024 20:23 11s master220
October 18, 2024 20:23 11s
add: suppressor for sp91 and wt550 (#5960)
Merge Conflict Detection #4: Commit 6270856 pushed by Ssheya
October 18, 2024 20:22 15s master220
October 18, 2024 20:22 15s
Merge branch 'ss220-space:master220' into master220
Merge Conflict Detection #3: Commit dfc9091 pushed by Ssheya
October 4, 2024 05:33 11s master220
October 4, 2024 05:33 11s
Merge pull request #3 from Ssheya/nanomap-render
Merge Conflict Detection #2: Commit f863fbd pushed by Ssheya
October 4, 2024 05:30 11s master220
October 4, 2024 05:30 11s
Automatic changelog generation
Merge Conflict Detection #1: Commit 86ec6b6 pushed by Ssheya
October 3, 2024 13:41 4m 31s master220
October 3, 2024 13:41 4m 31s