Jon Elson wrote: > I think I got to a good point with my velocity estimation changes and > tried to push to the > git repository, but a get push command gets : > To ssh://jmel...@git.linuxcnc.org/git/emc2.git > ! [rejected] master -> master (non-fast forward) > error: failed to push some refs to > 'ssh://jmel...@git.linuxcnc.org/git/emc2.git' > > I'm pretty sure the last time I did this, git push was all I needed. > OK, fixed it myself. I had to do a git pull, and enter my passphrase TWICE. I don't know why that was required, at first I thought it was rejecting my passphrase, but it must have opened two connections to the repository, and required the passphrase each time. Anyway, when I did that, the pull worked, then I could do the push.
git is still pretty mysterious to me! Every time I need to edit something, I seem to need to pull a complete new source tree, rather than update one of the existing local source trees. Obviously I'm doing it all wrong.... I've tried reading the git documents on our wiki, but I didn't see what I was doing wrong. Jon ------------------------------------------------------------------------------ The Next 800 Companies to Lead America's Growth: New Video Whitepaper David G. Thomson, author of the best-selling book "Blueprint to a Billion" shares his insights and actions to help propel your business during the next growth cycle. Listen Now! http://p.sf.net/sfu/SAP-dev2dev _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
