I've just used lily-git to do a hard reset of my git, reapplied the changes, 
recommitted and redone the push --dry-run and am still getting the same error.  
I'm not quite sure what it means for "commit you want to push must follow 
origin/master" but it's definitely the sole commit which is on the latest 
version of master.  

--
Phil Holmes


  ----- Original Message ----- 
  From: Bertrand Bordage 
  To: Phil Holmes 
  Cc: lilypond-devel@gnu.org ; David Kastrup 
  Sent: Thursday, September 22, 2011 1:40 PM
  Subject: Re: Problem with git push


  The commit you want to push must follow origin/master.


  If it does, just do:
  git push --dry-run origin [hash_of_the_commit]:master
  This will push this single commit.


  If not, you have to rebase so that the commit follows origin/master:
  git rebase -i origin
  An editor opens, where you can change the order of the commits:
  pick [small_hash1] [name1]
  pick [small_hash2] [name2]
  pick [small_hash2] [name2]


  Rewrite this list so that the commit you want to push is on top.
  Then git push origin [hash]:master


  Bertrand
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to