Hi Holger, Holger Levsen schreef op do 24-10-2019 om 14:59 [+0000]: > Hi Frans, > > On Tue, Oct 22, 2019 at 11:22:48PM +0200, Frans Spiesschaert wrote: > > > while updating (weblate) from git as often as git is updated? > > > > Indeed. > > > please update weblate, I've updated some manuals in git from the > wiki. >
Thank you for notifying me. 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. 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%). 2. - at Weblate, execute a "reset of all changes in the local repository". 3. - at weblate, pull in all changes from salsa. That way the merge conflict was easily resolved without any loss of content. 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. I have no clue on how to handle this. Suggestions are very welcome. -- Kind regards, Frans Spiesschaert
