[Bugs] #418 NORM: Can not push/pull on/from git.sugarlabs.org for jukebox activity

[SugarLabs Bugs]

#418: Can not push/pull on/from git.sugarlabs.org for jukebox activity
----------------------------------+-----------------------------------------
    Reporter:  kushal             |          Owner:  kushal                     
        Type:  defect             |         Status:  assigned                   
    Priority:  Normal             |      Milestone:  Unspecified by Release Team
   Component:  git.sugarlabs.org  |        Version:  Unspecified                
    Severity:  Unspecified        |     Resolution:                             
    Keywords:                     |   Distribution:  Unspecified                
Status_field:  Unconfimed         |  
----------------------------------+-----------------------------------------

Comment(by kushal):

 Now for me it looks my offcie ip is somehow blacklisted as if I try to
 push/pull from my home I am getting a different error (I need help on that
 also :p )

 [kdas at d80 jukebox-activity]$ git push
 To gitorious at git.sugarlabs.org:jukebox/mainline.git
  ! [rejected]        master -> master (non-fast forward)
 error: failed to push some refs to
 'gitorious at git.sugarlabs.org:jukebox/mainline.git'

 [kdas at d80 jukebox-activity]$ git pull
 You asked me to pull without telling me which branch you
 want to merge with, and 'branch.master.merge' in
 your configuration file does not tell me either.  Please
 name 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 on the refspec.

 If you often merge with the same branch, you may want to
 configure the following variables in your configuration
 file:

     branch.master.remote = <nickname>
     branch.master.merge = <remote-ref>
     remote.<nickname>.url = <url>
     remote.<nickname>.fetch = <refspec>

 See git-config(1) for details.

-- 
Ticket URL: <http://dev.sugarlabs.org/ticket/418#comment:4>
Sugar Labs <http://sugarlabs.org/>
Sugar Labs bug tracking system