Le 21/03/2012 16:14, Vincent van Ravesteijn a écrit :
There is also a 2.0.x branch in your first clone, so you can just cherry-pick the commit to master directly onto this 2.0.x branch, and push from there.
But If I want to compile both the master and the branch without doing a full rebuild everytime, I have to have two checkouts living in different places, right? And moreover, I have to update satus.20x.
You can also push directly from your 2.0.x clone by adding the remote to this clone: $ git remote add lyx g...@git.lyx.org:lyx
OK
Now you can push your branch to "lyx": $ git push lyx 2.0.x
How come I have to specify "lyx 2.0.x". Isn't it possible to setup the branch so that "git push" will do the right thing?
The hint in the error message says that you have to merge the remote changes before you push. This is the same as that svn would tell you that your repo is not up to date. Most probably the following will solve this: $ git pull --rebase
In which repository? Thanks. JMarc
