Re: Unable to merge staging

[Francisco Vila]

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.
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com