Re: Weblate: ibus-typing-booster: Failed rebase on repository: What does that mean?

Mike FABIAN <[email protected]> さんはかきました:

> Mike FABIAN <[email protected]> さんはかきました:
>
>> 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/#history
>>> 
>>> 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.

-- 
Mike FABIAN <[email protected]>
睡眠不足はいい仕事の敵だ。
_______________________________________________
trans mailing list -- [email protected]
To unsubscribe send an email to [email protected]
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/[email protected]