Re: git-bisect is magical

From: walt <wa1ter@myrealbox.com>
Date: Jan 10, 2006, 20:43 UTC
Message-ID: <dq168p$3kt$1@sea.gmane.org>
In-Reply-To: <Pine.LNX.4.64.0601101143180.4939@g5.osdl.org>

Linus Torvalds wrote:

Show 13 quoted lines

> 
> On Tue, 10 Jan 2006, Linus Torvalds wrote:
>> You can _undo_ the revert, so it's not permanent in that sense. Just do
>>
>> 	git reset --hard origin
>>
>> and your "master" branch will be forced back to the state that "origin" 
>> was in.
> 
> Btw, you can try this (careful - it will also undo any dirty state you 
> have in your working tree), and then do the "pull" again (which should now 
> be a trivial fast-forward) and then just try to do the "git revert" on the 
> new state.

Just by stumbling around and trying things at random, I did a 'git-checkout origin' which *seemed* to resolve the merge-conflict, but left me feeling uneasy because I don't really understand what I'm doing. Can you give a short explanation of the difference between 'git reset --hard origin' and 'git-checkout origin'?

> An even better option is obviously to figure out _why_ that commit broke 
> for you in the first place, and get it fixed up-stream...

I'm still waiting for the insulting email from the developer ;o) How long should I wait for a response before I start bugging other people?