lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Unable to merge staging


From: James
Subject: Re: Unable to merge staging
Date: Thu, 13 Feb 2014 12:51:51 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0

On 13/02/14 10:18, Francisco Vila wrote:
2014-02-13 10:47 GMT+01:00 David Kastrup <address@hidden>:
Looking at git log --stat it would appear that I did not realize changes
to be in both files.  However, in order to avoid unexpected changes
(even if just in whitespace etc),
Yes, what makelsr does to the same snippets in snippets/ only is the
same I did in my patch, except it also adds a newline.

one should always just do the changes
in snippets/new manually and then commit the makelsr run separately.
Understood.

Running makelsr after my changes on snippets/new changes version to 3
unrelated snippets.
Oh and don't forget to update the Trackers with the correct labels and commit message so we know it is closed.

James



reply via email to

[Prev in Thread] Current Thread [Next in Thread]