cage:~/Sourceforge/csound/New/csound6> git pull; git push
Password: 
X11 forwarding request failed on channel 0
Already up-to-date.
Password: 
X11 forwarding request failed on channel 0
To ssh://jpff@git.code.sf.net/p/csound/csound6-git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://jpff@git.code.sf.net/p/csound/csound6-git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
cage:~/Sourceforge/csound/New/csound6>


What now?

==John ffitch

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

What branch are you in? Also, what is the output of `git config -l`?


PS: you might want to set up an ssh key+agent to avoid typing the password.

On Tue, Jan 21, 2014 at 12:11 PM, John ffitch  wrote:
> cage:~/Sourceforge/csound/New/csound6> git pull; git push
> Password:
> X11 forwarding request failed on channel 0
> Already up-to-date.
> Password:
> X11 forwarding request failed on channel 0
> To ssh://jpff@git.code.sf.net/p/csound/csound6-git
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'ssh://jpff@git.code.sf.net/p/csound/csound6-git'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and integrate the remote changes
> hint: (e.g. 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> cage:~/Sourceforge/csound/New/csound6>
>
>
> What now?
>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> CenturyLink Cloud: The Leader in Enterprise Cloud Services.
> Learn Why More Businesses Are Choosing CenturyLink Cloud For
> Critical Workloads, Development Environments & Everything In Between.
> Get a Quote or Start a Free Trial Today.
> http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net