From: Petr Baudis Date: Thu, 10 Nov 2005 23:22:10 GMT Subject: Re: Expected Behavior? Message-ID: <20051110232210.GC30496@pasky.or.cz> In-Reply-To: <7vzmocw1xd.fsf@assigned-by-dhcp.cox.net> Dear diary, on Thu, Nov 10, 2005 at 11:52:46PM CET, I got a letter where Junio C Hamano said that... > One thing I _don't_ like about both is there is no way for 'git > reset --hard' to get rid of them, when the user decides to retry > from scratch after seeing a failed merge that left too many of > them. Yes. You can cg-clean, but that'll wipe out other stuff as well. I plan to fix that by adding some conflicts tracking to Cogito - I'm not yet decided on the particular implementation (only that I certainly don't want to require the user to manually tell Cogito about resolved conflicts). -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.