Mike FABIAN mfabian@redhat.com さんはかきました:

Mike FABIAN mfabian@redhat.com さんはかきました:

...

A few hours after I merged Weblate’s most recent pull request, this happened in Weblate:

...

https://translate.stg.fedoraproject.org/projects/ibus-typing-booster/app/#hi...

2 hours ago None New alert Could not merge the repository. ibus-typing-booster/app 2 hours ago None Failed rebase on repository ibus-typing-booster/app

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?

I wonder how I could use 'git am --show-current-patch' to see the failed patch. At

https://github.com/weblate/ibus-typing-booster/tree/weblate-ibus-typing-booster-app

I see:

“This branch is even with mike-fabian:master. ”

As these two repos are apparently in sync, the problem must be in a difference to yet another repo I don’t know about.

I pushed an update for the ibus-typing-booster.pot file to

https://github.com/mike-fabian/ibus-typing-booster

in the hope that this might trigger weblate to resync somehow.

Great, thank you!

On Sun, 17 Nov 2019, 02:37 Jean-Baptiste, jean-baptiste@holcroft.fr wrote:

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/1584339d5e111afc16...

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, _______________________________________________ trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org