Chih-Hsuan Yen

> I think this happens when a new translation file is created and weblate pushes it immediately (as empty template) always, the author starts editing and therefor the conflict. That...

Oh, I never understand how the commit button in weblate works. > At the end it's a rare thing, maybe not even 1% of the PR's cause a failure. Completely...

Got it, that sounds reasonable! Hopefully such conflicts can be eliminated in the future.

@tsujan https://github.com/tsujan/FeatherPad/commit/03800e4e967331a049cb7cd48eeaec848d9583c3 mixes changes of non-translations and translations. Did you manually pick `et` translations from Weblate? It causes git merge conflicts later as `et` translations are updated again on Weblate.

Got it! Didn't know about auto suggestions and corrections. Those are nice features! This time a string happens to be updated by auto suggestion and manual changes on Weblate. I...

Yep delayed rebase operations increases the possibility of conflicts as translators on Weblate may not know the main repo has been changed if the latter happened after the last periodic...

Wow, now here comes a conflict caused by missing webhooks. Here is the timeline: * On 2021-04-23T13:13:02+00:00, jrtlxqt modified an existing translation string, and thus the latest commit in Weblate's...

Recently, rebase failures are much more frequent than ever, and that is somewhat annoying. I think I need to find a way to avoid them. Meanwhile, I started to write...

Ideally, weblate can automate as many things as possible. Currently I'm looking at the git squash addon to see if it can be improved.

No hurry ;) If I found a feature in newer versions and it helps on this issue, I will tell you~