Problem with pushing

[James Lowe]

Hello (be gentle),

I have just pushed a change to the CG but forgot to commit some additional 
changes so they didn't get pushed.

So the CG won't compile now.

I know how to fix this, but when I have tried to push these additional fixes I 
get the following message

---

! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://address@hidden/srv/git/lilypond.git'
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.

---

I've tried to abort and reset (big red button in Lilygit.tcl) and done the 
edits from scratch and created a new patch, but I can't shake this message any 
time I push.

can someone help?

James