[Bugs] #1716 UNSP: Calculate: Pootle commit error

Sugar Labs Bugs bugtracker-noreply at sugarlabs.org
Mon Feb 8 22:40:44 EST 2010


#1716: Calculate: Pootle commit error
------------------------------------------+---------------------------------
    Reporter:  cjl                        |          Owner:  sayamindu                  
        Type:  defect                     |         Status:  new                        
    Priority:  Unspecified by Maintainer  |      Milestone:  Unspecified by Release Team
   Component:  localization               |        Version:  Unspecified                
    Severity:  Unspecified                |       Keywords:                             
Distribution:  Unspecified                |   Status_field:  Unconfirmed                
------------------------------------------+---------------------------------
 Specifically zh_TW.po

 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.

-- 
Ticket URL: <http://bugs.sugarlabs.org/ticket/1716>
Sugar Labs <http://sugarlabs.org/>
Sugar Labs bug tracking system


More information about the Bugs mailing list