On one computer xenakis:~/Sourceforge/csound/csound6 260> git branch HEAD devel * develop master origin/develop typesystem xenakis:~/Sourceforge/csound/csound6 261> ogn the other just * develop master origin/develop Quoting Victor Lazzarini : > What does your git branch say? > > ligeti-2:csound6 victor$ git branch > * develop > master > > > > On 14 Nov 2013, at 19:25, jpff wrote: > >> I get >> >> To ssh://jpff@git.code.sf.net/p/csound/csound6-git >> ! [rejected] master -> master (non-fast-forward) >> ! [rejected] typesystem -> typesystem (non-fast-forward) >> error: failed to push some refs to >> 'ssh://jpff@git.code.sf.net/p/csound/csound6-git' >> To prevent you from losing history, non-fast-forward updates were rejected >> Merge the remote changes (e.g. 'git pull') before pushing again. See the >> 'Note about fast-forwards' section of 'git push --help' for details. >> >> So I do a pull and the same happens. Tried on two machines with the >> same result >> >> help? >> ==John ffitch >> >> ------------------------------------------------------------------------------ >> DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps >> OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access >> Free app hosting. Or install the open source package on any LAMP server. >> Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! >> http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk >> _______________________________________________ >> Csound-devel mailing list >> Csound-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/csound-devel > > > ------------------------------------------------------------------------------ > DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps > OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access > Free app hosting. Or install the open source package on any LAMP server. > Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! > http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel ------------------------------------------------------------------------------ DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net