I have a jneeman branch on savannah that has some old changes I don't particularly want to keep. I have some new experimental changes on my local copy that I want to push to savannah. Basically, I want to overwrite the jneeman branch on savannah with my current working copy.
I do "git push jneem" and it responds with error: remote 'refs/heads/jneeman' is not a strict subset of local ref 'refs/heads/jneeman'. maybe you are not up-to-date and need to pull first?
I do "git push --force jneem" and it responds with
updating 'refs/heads/jneeman' from cc5a0aa1622d97a69e06f5876482920cfcd05466 to c1bcb1e34e8aee46c9b74ac7d64f1838f7ef9a86 Generating pack...
Done counting 12 objects. Result has 7 objects. Deltifying 7 objects. 100% (7/7) done Total 7, written 7 (delta 5), reused 1 (delta 0) Unpacking 7 objects error: denying non-fast forward; you should pull first
OK, so I try "git pull jneem" (even though I don't really want to pull) and I get
Generating pack... Done counting 127 objects. Result has 88 objects. Deltifying 88 objects. 100% (88/88) done
Unpacking 88 objects Total 88, written 88 (delta 73), reused 17 (delta 11) 100% (88/88) done * refs/heads/jneeman: does not fast forward to branch 'jneeman' of
git+ssh://address@hidden/srv/git/lilypond; not updating.
and nothing has changed in my working copy. Any ideas?