<span style="font-family:arial,sans-serif;font-size:13px">"Obliterate everything that is in remote, and put the local copy into </span><span style="font-family:arial,sans-serif;font-size:13px">it."</span><br><div>
<span style="font-family:arial,sans-serif;font-size:13px"><br></span></div><div><span style="font-family:arial,sans-serif;font-size:13px">The push option that does this is force which can be enabled with -f or --force. So you would do:</span></div>
<div><span style="font-family:arial,sans-serif;font-size:13px">git push -f github master:master</span></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 15, 2012 at 4:17 PM, Fred Nugen <span dir="ltr"><<a href="mailto:noojon@gmail.com" target="_blank">noojon@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">> Have you verified that your ssh key is working with github?<br>
<br>
</div>I haven't. I deleted all the id_rsa keys and the known_hosts file and<br>
hoped it would go back to password authentication. Same problem. Then<br>
I tried https, and got something else I don't understand (see below).<br>
<br>
I read the note referenced in the error message, and I don't<br>
understand non-fast-forwards. I want the command that says,<br>
"Obliterate everything that is in remote, and put the local copy into<br>
it."<br>
<br>
Better yet, could someone look to see if there happens to be an<br>
updated version at<br>
git://<a href="http://git.cscs.ch/ArrowGlyph.git" target="_blank">git.cscs.ch/ArrowGlyph.git</a><br>
and if so, make it be in <a href="http://github.com/nooj/ArrowGlyph" target="_blank">github.com/nooj/ArrowGlyph</a>? I think I made<br>
my github repo public.<br>
<div class="im"><br>
<br>
(master) cozumel:~/www/tacc/ArrowGlyph nooj$ git remote rm github<br>
<br>
(master) cozumel:~/www/tacc/ArrowGlyph nooj$ git remote add github<br>
</div><a href="https://nooj@github.com/nooj/ArrowGlyph" target="_blank">https://nooj@github.com/nooj/ArrowGlyph</a><br>
<div class="im"><br>
(master) cozumel:~/www/tacc/ArrowGlyph nooj$ git push github master:master<br>
</div>Password:<br>
To <a href="https://nooj@github.com/nooj/ArrowGlyph" target="_blank">https://nooj@github.com/nooj/ArrowGlyph</a><br>
! [rejected] master -> master (non-fast-forward)<br>
error: failed to push some refs to '<a href="https://nooj@github.com/nooj/ArrowGlyph" target="_blank">https://nooj@github.com/nooj/ArrowGlyph</a>'<br>
To prevent you from losing history, non-fast-forward updates were rejected<br>
Merge the remote changes before pushing again. See the 'Note about<br>
fast-forwards' section of 'git push --help' for details.<br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Robert Maynard<br>
</div>