Le 12/11/2019 à 02:25, Mike FABIAN a écrit :
A few hours after I merged Weblate’s most recent pull request, this
happened in Weblate:
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch (1)
Is this something I need to worry about, or will Weblate fix this automatically?
Hello Mike,
you updated the pot file of your project. Then, you updated every single
po files:
https://github.com/mike-fabian/ibus-typing-booster/commit/1584339d5e111af...
This creates conflicts on po files with Weblate.
Weblate already knows when you update your pot file, don't update po
files please.
Situation is now fixed.
Have a nice day,