[Localization] Error committing calculate-activity.po for fructose 0.82

[Simon Schampijer]

On 09/09/2010 06:54 PM, Markus Schlager wrote:
> Hi Simon,
>
> Error log:
>
> Failed to commit file: [GIT] pull failed (['git', '--git-dir',
> '/var/lib/pootle/checkouts/fructose82/calculate-activity/.git', 'pull']):
>> From gitorious at git.sugarlabs.org:calculate/mainline 870aafc..3417aa1
> master ->  origin/master 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.
>
> ?
>
> Markus

Hi Markus,

sorry for the delay. If you do "git branch" you can see the branch you 
are currently on. Did this work for you before?

Regards,
    Simon