Re: merging confusion and question

2012-08-08 Thread Rich Pixley
Thank you. I think the work flow here needs some work, but reset --hard gets me running again. That should probably be mentioned in the error message. --rich On 8/7/12 18:43 , Junio C Hamano wrote: Rich Pixley writes: I'm confused. What is the intended work flow here? Ie, aside

merging confusion and question

2012-08-07 Thread Rich Pixley
I'm confused. What is the intended work flow here? Ie, aside from trashing my repository and starting over, what does one do to recover? rich@cobra> git clone /home/rich/repos/webos webos Cloning into 'webos'... done. rich@cobra> cd webos rich@cobra> git remote add central g...@github.com:ope