[Localization] Attention: Language Admins
Chris Leonard
cjlhomeaddress at gmail.com
Mon Feb 8 22:42:12 EST 2010
On Mon, Feb 8, 2010 at 9:15 PM, Yuan Chao <yuanchao at gmail.com> wrote:
>
> Hi cjl,
>
> I'm trying to commit the POs marksed as "not checked" in Pootle 2.0. Most
> of them become "checked" without problem. However, I've got some of them
> with the following error:
>
> Failed to commit file: [GIT] pull failed (['git', '--git-dir',
> '/var/lib/pootle/checkouts/fructose82/calculate-activity/.git',
> 'pull']): You asked me to pull without telling me which branch you
> want to merge with, and 'branch.sucrose-0.82.merge' in your
> configuration file does not tell me either. Please specify which
> branch you want to merge on the command line and try again (e.g. 'git
> pull <repository> <refspec>'). See git-pull(1) for details. If you
> often merge with the same branch, you may want to configure the
> following variables in your configuration file:
> branch.sucrose-0.82.remote = <nickname> branch.sucrose-0.82.merge =
> <remote-ref> remote.<nickname>.url = <url> remote.<nickname>.fetch =
> <refspec> See git-config(1) for details.
>
> Do you know how should I fix them? Thanks.
>
>
Yuan,
That looks like some sort of error in the connection between Pootle and git
on the back-end. That is type of magic that Sayamindu typically handles.
Hopefully he can look into this and get back to you on the list.
I've filed this ticket in Trac so that it won't get forgotten.
http://dev.sugarlabs.org/ticket/1716
cjl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.laptop.org/pipermail/localization/attachments/20100208/18decfd0/attachment.htm
More information about the Localization
mailing list