Re: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

From: Christian Couder <christian.couder@gmail.com>
Date: Jun 5, 2015, 08:38 UTC
Message-ID: <CAP8UFD1DcSB+679KHngYP5g6wPzsM3CtmHAC9-XZkFCiG0ZTaw@mail.gmail.com>
In-Reply-To: <CAP8UFD0cJoh2YrxD-Cjr-r37SGDOcy=VafETAN4suxS0HVa6sA@mail.gmail.com>

On Fri, Jun 5, 2015 at 10:07 AM, Christian Couder <christian.couder@gmail.com> wrote:

Show 12 quoted lines

> On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas
> <Andreas.Gondek@dwpbank.de> wrote:
>> Thanks, thanks, thanks.
>>
>> One last question. If I don't want to compile Git myself, how long may the pu branch take approx. to get into a next release?
>
> According to:
>
> https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt
>
> "One release cycle for a feature release is expected to last for eight
> to ten weeks."

Actually I should have read the next lines that say:

"- Maintenance releases are numbered as vX.Y.Z and are meant to contain only bugfixes for the corresponding vX.Y.0 feature release and earlier maintenance releases vX.Y.W (W < Z)."

> As v2.4.2 was tagged on May 26, the next feature release should be in
> 6 to 9 weeks, and will hopefully include the feature you are
> interested in.

The last feature release was v2.4.0 that was tagged on April 30, so the next one should be in 3 to 5 weeks.