Alert "Could not merge the repository." in Fedora Weblate

[rffontenelle]

The translation component in Fedora Weblate has the following information in the alert page:

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

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://translate.fedoraproject.org/git/fedora-media-writer/mediawriter/ ; git remote update weblate
3. Merge Weblate changes and resolve any conflicts. git merge weblate/main
4. Rebase Weblate changes on top of upstream and resolve any conflicts. git rebase origin/main
5. Push changes into upstream repository. git push origin main
6. 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.

Appeared 2 months ago, last seen 8 days ago

[rffontenelle]

Should be fixed now, considering alerts are no longer shown and considering the PR #646