[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lilypond-devel
Subject:    Re: How to procede with \override/\revert business
From:       Francisco Vila <paconet.org () gmail ! com>
Date:       2012-10-30 8:46:31
Message-ID: CACAEdyBSaYEm3S5R=KEv=+CEQJnfV0F8h5JMFoYgi1imeem_XQ () mail ! gmail ! com
[Download RAW message or body]

2012/10/30 David Kastrup <dak@gnu.org>:
> Francisco Vila <paconet.org@gmail.com> writes:
>
>> 2012/10/28 David Kastrup <dak@gnu.org>:
>>> The translations for 2.16.1 are pretty much through, and I merged into
>>> master again.
>>
>> I updated Documentation/es/changes.tely for stable and committed to
>> translation branch. Then updated the same file for 2.17 (I wrongly
>> said it was for 2.16 in the commit info) and committed to staging
>> branch. This is a source of conflict, but the merge shows no conflict.
>> Why?
>
> Because in the course of back- and forward synching, it would appear
> that I already merged this change into staging before you did:

> Hopefully, I would have resolved any conflicts correctly when doing
> that.

Yes, it looks so. I just expected the merge commit to show what files
the conflicts were in, as usual. At the end, details about it are not
important because the result is fine.

-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


[prev in list] [next in list] [prev in thread] [next in thread]