Weblate could not merge upstream changes while updating the repository.
Rebasing (1/7)
Auto-merging po/mediawriter_hu.po
CONFLICT (content): Merge conflict in po/mediawriter_hu.po
error: could not apply b481957... Translated using Weblate (Hungarian)
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 b481957... Translated using Weblate (Hungarian)
(1)
Typical workflow for fixing merge conflicts
Commit all pending changes in Weblate and lock the translation component.
wlc commit; wlc lock
Add Weblate exported repository as a remote.
git remote add weblate https://translate.fedoraproject.org/git/fedora-media-writer/mediawriter/ ; git remote update weblate
Merge Weblate changes and resolve any conflicts.
git merge weblate/main
Rebase Weblate changes on top of upstream and resolve any conflicts.
git rebase origin/main
Push changes into upstream repository.
git push origin main
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
The translation component in Fedora Weblate has the following information in the alert page: