Hosted Weblate Japanese language conflicts alert

[sanak]

Hosted Weblate alerts following Japanese language conflicts today. https://hosted.weblate.org/projects/smash/smash-main-app/#alerts

Weblate could not merge upstream changes while updating the repository.

Rebasing (1/1)
error: could not apply 0e8fe69... Translated using Weblate (Japanese)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0e8fe69... Translated using Weblate (Japanese)
Auto-merging lib/l10n/intl_ja.arb
CONFLICT (content): Merge conflict in lib/l10n/intl_ja.arb
 (1)

Typical workflow for fixing merge conflicts

1. Commit all pending changes in Weblate and lock the translation component. wlc commit; wlc lock
2. Add Weblate exported repository as a remote. git remote add weblate https://hosted.weblate.org/git/smash/smash-main-app/ ; git remote update weblate
3. Merge Weblate changes and resolve any conflicts. git merge weblate/main
4. Push changes into upstream repository. git push origin main
5. Weblate should now be able to see updated repository and you can unlock it. wlc pull ; wlc unlock

Check the FAQ for info on how to resolve this.