Re: merging confusion and question

Phil Hord writes: > I agree that 'git reset --hard' should be mentioned in the hint for > newbies, but this conflicts with my desire to avoid giving chainsaws > to toddlers. Exactly. So what are you suggesting? Perhaps force the user to go through a series of quiz when "git merge" was run by t

Re: merging confusion and question

On Tue, Aug 7, 2012 at 9:43 PM, Junio C Hamano wrote: > Rich Pixley writes: > >> 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 i

Re: merging confusion and question

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 from tr

Re: merging confusion and question

Rich Pixley writes: > 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 r

merging confusion and question

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