On Fri, May 16, 2014 at 11:50:44AM -0400, Richard Heck wrote: > On 05/16/2014 11:07 AM, Enrico Forestieri wrote: > >Richard, this could go to branch. It's only cosmetic, though. > > As you think best.
I pushed it. However, git told me bad things: $ git push Counting objects: 9, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 1.07 KiB, done. Total 5 (delta 4), reused 0 (delta 0) To g...@git.lyx.org:lyx b17802b..f5a246b 2.1.x -> 2.1.x ! [rejected] 2.0.x -> 2.0.x (non-fast-forward) error: failed to push some refs to 'g...@git.lyx.org:lyx' 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. I think it is still trying to do something with the 2.0.x branch behind my back. What are the magic words I have to use to stop it from doing that? -- Enrico
