"Could not merge the repository" on Fedora Weblate
Since the main branch migrated from 'master' to 'main', the main translation component (named 'master') available in Fedora Weblate is not locked due to not being able to find the upstream branch.
See https://translate.fedoraproject.org/projects/plymouth/master/#alerts
For your convenience, I copied the text from the above link here:
Could not merge the repository.
Weblate could not merge upstream changes while updating the repository.
fatal: bad revision '..origin/master' (128)
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/plymouth/master/ ; git remote update weblate
- Merge Weblate changes and resolve any conflicts.
git merge weblate/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
Check the FAQ for info on how to resolve this.
Appeared 2 days ago, last seen 6 hours ago