Re: [PATCH] modify/delete conflict resolution overwrites untracked file
Junio C Hamano <gitster@pobox.com> writes:
Show 10 quoted lines
> Clemens Buchacher <drizzd@aon.at> writes:
>
> > I strongly disagree. With the suggested behavior I would have to
> > double-check every single untracked file in my tree for conflicts before
> > trying a throw-away merge followed by git reset --hard, for example.
>
> AFAICS, that's not "suggested behaviour" for merge, but it is the
> behaviour that has been true for eternity.
>
> You can suggest to fix "reset --hard", though.
Errr... what about using "reset --merge" instead?
--
Jakub Narebski
Poland
ShadeHawk on #git
Jakub Narebski <jnareb@gmail.com>