On Fri, May 16, 2014 at 05:45:27PM -0400, Scott Kostyshak wrote: > On Fri, May 16, 2014 at 5:02 PM, Enrico Forestieri <for...@lyx.org> wrote: > > >> Merge the remote changes (e.g. 'git pull') before pushing again. See the > > When I get this error, doing a > git pull --rebase > is usually what I want. Git will not let you push if you do not have > the latest version. Even if you edited a file that does not conflict > with the updates you don't have. The "--rebase" just tells git to put > your patch on top of the commits that you're going to pull in.
No, this cannot be the reason. My procedure for pushing is the following: $ git commit -a $ git pull --rebase $ git push so, I had just issued that command. It has something to do with the fact that previously I had 2.0.x as a checked out branch and then I switched to 2.1.x. Now git is still someway trying to also push 2.0.x and I would like to tell it not to do that, but I don't know neither why it still insists on 2.0.x nor what I can do. Maybe it is simpler to start afresh and clone again the repository. I like very much git branches. -- Enrico
