On Mon, May 21, 2007 at 09:04:00 -0600, Brian Paul wrote: > 1. Whenever I push changes on my master branch I'm seeing: > > updating 'refs/heads/master' > from 9e8a961dd7d7b717a9fb4ecdea1c1b60ea355efe > to a8676c45ccab52117c70f2e90fd820d745261f51 > error: remote 'refs/heads/mesa_7_0_branch' is not a strict subset of > local ref 'refs/heads/mesa_7_0_branch'. maybe you are not up-to-date and > need to pull first? > > How do I fix that? > I think 'git-push origin master' shouldn't push to mesa_7_0_branch.
> > 2. I can't seem to push changes on my mesa_7_0_branch anymore: > > $ edit file > $ commit file > $ git push origin mesa_7_0_branch > error: remote 'refs/heads/mesa_7_0_branch' is not a strict subset of > local ref 'refs/heads/mesa_7_0_branch'. maybe you are not up-to-date and > need to pull first? > > git fetch > Generating pack... > Done counting 177 objects. > Packing 177 objects...................... > Indexing 177 objects. > 100% (177/177) done > Resolving 80 deltas. > 100% (80/80) done > * refs/remotes/origin/master: fast forward to branch 'master' of > git+ssh://[EMAIL PROTECTED]/git/mesa/mesa > old..new: 4fca6bf..a8676c4 > * refs/remotes/origin/mesa_7_0_branch: fast forward to branch > 'mesa_7_0_branch' of git+ssh://[EMAIL PROTECTED]/git/mesa/mesa > old..new: fbcac5a..d38b74a > yutani 62$ git rebase origin Try 'git-rebase origin/mesa_7_0_branch' instead? Cheers, Julien ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
