On Fri, May 27, 2011 at 07:53:34PM -0600, Carl Sorensen wrote:
>
> The merge conflicts exist probably mostly because we have snippets listed at
> both 2.13.6x and 2.15.0. I guess once a snippet is backported to 2.13.6x,
> it should have the 2.13.6x in both stable/2.14 and master.
Huh, I hadn't t
Carl Sorensen writes:
> On 5/27/11 7:53 PM, "Carl Sorensen" wrote:
>> On 5/27/11 6:16 AM, "Graham Percival" wrote:
>>> Unfortunately, at the moment this produces a bunch of merge conflicts.
>>> Probably nothing serious, but it's an annoyance. Since it's been so
>>> long since the last release
2011/5/28 Carl Sorensen :
> The merge conflicts exist probably mostly because we have snippets listed at
> both 2.13.6x and 2.15.0. I guess once a snippet is backported to 2.13.6x,
> it should have the 2.13.6x in both stable/2.14 and master. I haven't done
> that, so I guess it's my mess to clean
On 5/27/11 7:53 PM, "Carl Sorensen" wrote:
> On 5/27/11 6:16 AM, "Graham Percival" wrote:
>> Unfortunately, at the moment this produces a bunch of merge conflicts.
>> Probably nothing serious, but it's an annoyance. Since it's been so
>> long since the last release, I just went ahead and re-cre
On 5/27/11 6:16 AM, "Graham Percival" wrote:
> Hi guys,
>
> I'd like to be able to do
> git checkout master
> git merge stable/2.14
> as implied by step 1 of "post release" on:
>
>
http://lilypond.org/doc/v2.13/Documentation/contributor/minor-release-checklis>
t
>
> This step is usef
Hi guys,
I'd like to be able to do
git checkout master
git merge stable/2.14
as implied by step 1 of "post release" on:
http://lilypond.org/doc/v2.13/Documentation/contributor/minor-release-checklist
This step is useful to get the news announcement of the release; I
don't expect to see any
