I want to like #Weblate, but the experience of resolving Git conflicts on repositories is such a headache… 🤕
Discussion
Loading...
Discussion
@pedro Speaking of which: I wish I could tell #Weblate to be the only and fully autoritative source for translations, discarding/overwriting all changes in the translation files in the repo, that are not the translation source.
So basically always overwrite everything that is not in the Weblate database and automatically updating strings from the source regardless if there are translations available already.
Right now I have to manually update all local translation files with new strings in order to have them available in Weblate, instead of just updating the translations template/source strings and have Weblate automatically add the missing strings to the already existing translation files.
@pedro If your setup is correct, conflicts should not happen; something can be improved. If they do, you can solve them by a single click on the Reset and reapply button in the Repository maintenance site of the conflicted component. And if you still have issues, feel free to reach out to our Care; the link is in our 
profile.
@weblate thanks! What’s a right configuration? Do you have anything written about that? (I’m new to Weblate)
Regarding the buttons, I knew about their existence but found them a bit confusing. For example, which one means resolve the conflict taking the upstream change?
Thanks!
@pedro Yes, there is this part of the docs; feel free to read around to choose the workflow that suits you the best: https://docs.weblate.org/en/latest/admin/continuous.html#avoiding-merge-conflicts
Read about the reset buttons at https://docs.weblate.org/en/latest/devel/integration.html#managing-the-local-vcs-repository and choose the one that feels the best. Options changed recently with 5.14 release that might not be runnin on your deployment yet. If you use https://hosted.weblate.org/, it is there. Reset and discard is probably the one you asked for.
@pedro how do conflicts come into play with that service? (I just looked them up)
bonfire.cafe
A space for Bonfire maintainers and contributors to communicate
Automatic federation enabled