|
| From: | David Kastrup |
| Subject: | Re: Auto-merging translations and master |
| Date: | Tue, 05 Jun 2012 11:37:55 +0200 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) |
Francisco Vila <address@hidden> writes:
> 2012/6/5 David Kastrup <address@hidden>:
>> The only automatic merges that are actually safe to do are
>> fast-forwards, and the translation merges are not of that kind.
>
> Sure? we change our own distinct files.
commit 30339cb3706f6399c84607426988b25f79b4998c
Merge: 9578677 9564d28
Author: Francisco Vila <address@hidden>
Date: Thu May 24 17:17:47 2012 +0200
Merge branch 'translation' into staging
Conflicts:
Documentation/de/notation/input.itely
Pretty much every update-with-convert-ly run touches conflicting files.
--
David Kastrup
| [Prev in Thread] | Current Thread | [Next in Thread] |