[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patchy merge fails - I know why but not sure if I can fix it
|
From: |
Francisco Vila |
|
Subject: |
Re: Patchy merge fails - I know why but not sure if I can fix it |
|
Date: |
Mon, 17 Feb 2014 11:56:18 +0100 |
El 17/02/2014 10:45, "James" <address@hidden> escribió:
>
> Hello,
>
> This last round of patches I removed the deprecated snippet
>
> printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
>
> and any reference to it in the NR (english).
>
> I ran Makelsr.py (you can see this in staging) but merge fails because of a reference to this snippet in the German docs. I am not sure if i can just go into the itely file in the 'de' section and remove the reference of if it needs to be done via the translation branches - hence this email - as I don't know what to do in this case without reading the CG and trying to learn the process.
You can edit the file in staging. That change will reach the translation branch when master is merged onto it.
>
> So I am about to leave for work but will be about an hour before I get online again.
>
> Sorry Phil/Dave.
>
> james
>
> _______________________________________________
> lilypond-devel mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/lilypond-devel