I have been having trouble with the following workflow. I am trying
to push changes to a remote from a branch that is tracking it.
git clone git://mysite.com/data/git/linux-devel.git linux-devel
cd linux-devel
git remote add -m master -f linux-stable
git://mysite.com/data/git/linux-stable.git
git branch -r
linux-stable/HEAD
linux-stable/master
origin/HEAD
origin/master
git checkout -b stable linux-stable/master
git cherry-pick b3b1eea69a (a commit from linux-devel)
git push linux-stable
error: remote 'refs/heads/master' is not a strict subset of local ref
'refs/heads/master'. maybe you are not up-to-date and need to pull
first?
error: failed to push to 'git://mysite.com/data/git/linux-stable.git'
Thanks for your help,
Sean