From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Mon, 15 Dec 2008 10:04:20 GMT
Subject: Re: [ANNOUNCE] GIT 1.6.1-rc3
Message-ID: <34543.bFoQE3daRhY=.1229335460.squirrel@webmail.hotelhot.dk>
In-Reply-To: <7voczdyh23.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:

> I have fixed a few more smallish (old) bugs after I tagged this, which
> will be in 'master' shortly, but it seems that this cycle is stabilizing
> fairly nicely.  Let's have a successful 1.6.1 tagged on 20th.  Please hunt
> and fix bugs until then.

Even though it is not a 1.6.1 regression, I wonder about the merge
conflict issue in

 http://thread.gmane.org/gmane.comp.version-control.git/100859/focus=101182


The patch in that post improved things somewhat, by making a correct
commit. Of course, the working tree then silently loses a file, which
could be seen as being worse than a fatal failure.


Anders.