Mike FABIAN <mfabian(a)redhat.com> さんはかきました:
A few hours after I merged Weblate’s most recent pull request, this
happened in Weblate:
> 2 hours ago None New alert Could not merge the repository.
> 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
“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.
Mike FABIAN <mfabian(a)redhat.com>