"Obliterate everything that is in remote, and put the local copy into it."
The push option that does this is force which can be enabled with -f or --force. So you would do: git push -f github master:master On Thu, Nov 15, 2012 at 4:17 PM, Fred Nugen <[email protected]> wrote: > > Have you verified that your ssh key is working with github? > > I haven't. I deleted all the id_rsa keys and the known_hosts file and > hoped it would go back to password authentication. Same problem. Then > I tried https, and got something else I don't understand (see below). > > I read the note referenced in the error message, and I don't > understand non-fast-forwards. I want the command that says, > "Obliterate everything that is in remote, and put the local copy into > it." > > Better yet, could someone look to see if there happens to be an > updated version at > git://git.cscs.ch/ArrowGlyph.git > and if so, make it be in github.com/nooj/ArrowGlyph? I think I made > my github repo public. > > > (master) cozumel:~/www/tacc/ArrowGlyph nooj$ git remote rm github > > (master) cozumel:~/www/tacc/ArrowGlyph nooj$ git remote add github > https://[email protected]/nooj/ArrowGlyph > > (master) cozumel:~/www/tacc/ArrowGlyph nooj$ git push github master:master > Password: > To https://[email protected]/nooj/ArrowGlyph > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to ' > https://[email protected]/nooj/ArrowGlyph' > To prevent you from losing history, non-fast-forward updates were rejected > Merge the remote changes before pushing again. See the 'Note about > fast-forwards' section of 'git push --help' for details. > -- Robert Maynard
_______________________________________________ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the ParaView Wiki at: http://paraview.org/Wiki/ParaView Follow this link to subscribe/unsubscribe: http://www.paraview.org/mailman/listinfo/paraview
