Could SKS please post instructions in English as what one is supposed
to do to get out of the state where git push says

To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

For a bonus, how does on prevent it happening?

I have this state on two machines now and there are not many left to destroy

==John ff

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

After that error, do:

git status -> verify there are no uncommited changes.
     Commit everything that needs commiting, undo any
     changes that don't need commiting.
git pull -> IF there are no uncommited changes, a merge will be attempted
fix merge errors if necessary
git push

On Wed, May 25, 2011 at 12:47, John ff  wrote:
> Could SKS please post instructions in English as what one is supposed
> to do to get out of the state where git push says
>
> To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>
> For a bonus, how does on prevent it happening?
>
> I have this state on two machines now and there are not many left to destroy
>
> ==John ff
>
> ------------------------------------------------------------------------------
> vRanger cuts backup time in half-while increasing security.
> With the market-leading solution for virtual backup and recovery,
> you get blazing-fast, flexible, and affordable data protection.
> Download your free trial now.
> http://p.sf.net/sfu/quest-d2dcopy1
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/

> After that error, do:
>
> git status -> verify there are no uncommited changes.
>      Commit everything that needs commiting, undo any
>      changes that don't need commiting.
> git pull -> IF there are no uncommited changes, a merge will be attempted
> fix merge errors if necessary
> git push
>

and when that does not work what then?  I have done that repeatedly

==John


------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Do any of the steps give any errors?

On Wed, May 25, 2011 at 12:56,   wrote:
>> After that error, do:
>>
>> git status -> verify there are no uncommited changes.
>>      Commit everything that needs commiting, undo any
>>      changes that don't need commiting.
>> git pull -> IF there are no uncommited changes, a merge will be attempted
>> fix merge errors if necessary
>> git push
>>
>
> and when that does not work what then?  I have done that repeatedly
>
> ==John
>
>
> ------------------------------------------------------------------------------
> vRanger cuts backup time in half-while increasing security.
> With the market-leading solution for virtual backup and recovery,
> you get blazing-fast, flexible, and affordable data protection.
> Download your free trial now.
> http://p.sf.net/sfu/quest-d2dcopy1
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/

> Do any of the steps give any errors?
>

yes, the push


After another cycle one machine seems to have recovered, but I am not sure
if the last fix was transmitted or not



------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

it looks like the fgens.c changes got through.
On 25 May 2011, at 18:08, jpff@cs.bath.ac.uk wrote:

>> Do any of the steps give any errors?
>>
>
> yes, the push
>
>
> After another cycle one machine seems to have recovered, but I am  
> not sure
> if the last fix was transmitted or not
>
>
>
> ------------------------------------------------------------------------------
> vRanger cuts backup time in half-while increasing security.
> With the market-leading solution for virtual backup and recovery,
> you get blazing-fast, flexible, and affordable data protection.
> Download your free trial now.
> http://p.sf.net/sfu/quest-d2dcopy1
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

Dr Victor Lazzarini
Senior Lecturer
Dept. of Music
NUI Maynooth Ireland
tel.: +353 1 708 3545
Victor dot Lazzarini AT nuim dot ie




------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net