User avatar suprememortal

Repository rebase failed

Rebasing (1/27)
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_nl.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_nl.properties
error: could not apply 7b52f25eae4... Translated using Weblate (Spanish (Mexico))
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 7b52f25eae4... # Translated using Weblate (Spanish (Mexico))
 (1)
10/03/2025
User avatar suprememortal

Repository rebase failed

Rebasing (1/27)
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_nl.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_nl.properties
error: could not apply 7b52f25eae4... Translated using Weblate (Spanish (Mexico))
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 7b52f25eae4... # Translated using Weblate (Spanish (Mexico))
 (1)
10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 10/03/2025
User avatar suprememortal

Changes committed

Changes committed 09/29/2025
User avatar suprememortal

Resource updated

The “projects/frameworks/game-framework/core/src/main/resources/translations/generic.properties” file was changed. 09/29/2025
User avatar suprememortal

String added in the repository

 
09/29/2025

Search