search

firasdib / regex101-translations

38 stars 27 forks source link

Weblate could not merge upstream changes #39

Closed LinXP closed 5 months ago

LinXP commented 5 months ago

Error:

Weblate could not merge upstream changes while updating the repository.

Rebasing (1/1)
Auto-merging spanish.json
CONFLICT (content): Merge conflict in spanish.json
error: could not apply 4f6554e... Translated (Spanish)
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".
Could not apply 4f6554e... Translated (Spanish)
 (1)
working-name commented 5 months ago

Hello, thanks for the notification! Weblate has issues playing nice with external changes. I'll get it sorted out in a few minutes.

working-name commented 5 months ago

Done.