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

It seems like you’re trying to push all branches by default, and that
you’re behind in some branches. In your ~/.gitconfig, do you have:

[push]
  default = current

On Thu, Nov 14, 2013 at 2:25 PM, 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

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

Okay, just to check, what command are you using for pushing?  Is it
just git push, or do you happen to have --all or some other flag?

On Thu, Nov 14, 2013 at 4:36 PM,   wrote:
>
> Quoting Steven Yi :
>
>> It seems like you?re trying to push all branches by default, and that
>> you?re behind in some branches. In your ~/.gitconfig, do you have:
>>
>> [push]
>>   default = current
>>
>
>
> Yes got that
>
>
>
> ------------------------------------------------------------------------------
> 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

I'm confused.

Your first message showed that you were trying to push the typesystem
and master branches. Note that there were no errors on the develop
branch, so no problem, those changes are still pushed.

The strange thing is that on push you are trying to push multiple
branches at the same time. What does `git config push.default` say?
This is the confusing part because the "current" setting should not
push other branches.

Note that this error will not be fixed by a pull, because a pull only
affects the current branch. Since you are currently on the develop
branch, the typesystem and master branches are not being updated, and
thus the messages reappear on push.

By the way, it seems like the typesystem branch was merged a while
ago, perhaps it needs to be deleted?

On Fri, Nov 15, 2013 at 4:51 AM,   wrote:
> And what does one do when the pull/push fails as was the case this
> time, and so often in the past?  Why did it change yesterday from
> earlier?
>
>
> Quoting Justin Smith :
>
>> Pulling should always be done before pushing. An upstream should not accept
>> a push if it has changes you have not pulled yet.
>>
>> It is better to explicitly specify the branch you want to push to or pull
>> from. ("git push origin develop" "git pull origin develop").
>>
>>
>> On Thu, Nov 14, 2013 at 2:22 PM,  wrote:
>>
>>>
>>> Quoting Steven Yi :
>>>
>>> > Okay, just to check, what command are you using for pushing?  Is it
>>> > just git push, or do you happen to have --all or some other flag?
>>> >
>>>
>>> git push
>>> and
>>> git push ; git pull
>>>
>>>
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> 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



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
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