Re: [RFC/PATCH] git-reset to remove "$GIT_DIR/MERGE_MSG"

From: Andreas Ericsson <ae@op5.se>
Date: Dec 5, 2006, 08:36 UTC
Message-ID: <45752F8E.9020405@op5.se>
In-Reply-To: <Pine.LNX.4.63.0612050847340.28348@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:

Show 16 quoted lines

> Hi,
> 
> On Mon, 4 Dec 2006, Junio C Hamano wrote:
> 
>>  * Marked as RFC because I suspect I am missing a valid use case
>>    where a user might want to say "reset" as part of continuing
>>    the conflicted merge resolution, although I do not think of
>>    any offhand...
> 
> I can only speak for myself, of course: When I use git-reset in a merge, 
> more often than not I use "--hard", in which case I want to try something 
> different. So yes, I like this patch.
> 
> The only possible exception I can think of: git-reset --mixed when a 
> merge failed.
>

Indeed, but any invocation of git-reset means you'll quite likely have to re-do the merge to get all changes anyways.

Like most others, I also use the --hard option most of the times when I have merge-errors (usually because I've forgotten to create a topic-branch to do my work in, so I create one from 'master', reset master to whatever it was last time I pulled and then try rebase'ing on to it).

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se