Hi Frans, On Thu, Oct 24, 2019 at 05:55:14PM +0200, Frans Spiesschaert wrote: > Thank you for notifying me. I'll try to think off that in future, always. Is it enough to notify you via the list or would you prefer to be cc:ed? > I would like to update Weblate, but I don't know how I should handle > the current situation. > Let me explain. > Debian-edu-doc on salsa and debian-edu-doc on weblate have diverged > which leads to merge conflicts. sigh > In the past I handled such a situation as follows: > > 1. > - on my PC, msmerge the weblate translation updates with the current > pot-files from salsa and commit the results to salsa. That, I did > yesterday. Thus, at this moment the git repo on salsa has up to date > translations for all languages, both the ones that are maintained at > weblate and the ones that are directly maintained at salsa (except for > debian-edu-buster-manual.hr.po, translated at 0,5%, and debian-edu- > buster-manual.pt_PT.po, translated at 0,6%). cool > 2. > - at Weblate, execute a "reset of all changes in the local repository". > 3. > - at weblate, pull in all changes from salsa. sounds good. > That way the merge conflict was easily resolved without any loss of > content. nice > But if I would do a reset at Weblate now, I'm afraid that debian-edu- > buster-manual.hr.po and debian-edu-buster-manual.pt_PT.po would get > lost. can't you upload those files directly to weblate? would maybe using a different branch for weblate help? (a branch where not-yet-ready translations could stay...) > I have no clue on how to handle this. me neither :) > Suggestions are very welcome. I tried... -- cheers, Holger ------------------------------------------------------------------------------- holger@(debian|reproducible-builds|layer-acht).org PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C
Attachment:
signature.asc
Description: PGP signature