Mike FABIAN <mfabian(a)redhat.com> さんはかきました:
Mike FABIAN <mfabian(a)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/...
>>
>> 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-b...
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.
--
Mike FABIAN <mfabian(a)redhat.com>
睡眠不足はいい仕事の敵だ。