2008/10/3 John Mandereau <[EMAIL PROTECTED]>:
> On 2008/10/03 20:32 +0200, Francisco Vila wrote:
>> Done, it's my first time, sorry for the dumb commit name.
>
> All this advice is for the next time...
> When you merge a branch, you're supposed to keep the commit message head
> line, so it's obviou
On 2008/10/03 20:32 +0200, Francisco Vila wrote:
> Done, it's my first time, sorry for the dumb commit name.
All this advice is for the next time...
When you merge a branch, you're supposed to keep the commit message head
line, so it's obvious this commit is a merge commit, and you must keep
the c
2008/10/3 John Mandereau <[EMAIL PROTECTED]>:
> Hi Francisco,
>
> I can't merge lilypond/translation into master because it produces
> conflicts in 3 doc files in Spanish; could you merge and fix the
> conflicts yourself, and push the result to either lilypond/translation
> or master (pushing to bo
Hi Francisco,
I can't merge lilypond/translation into master because it produces
conflicts in 3 doc files in Spanish; could you merge and fix the
conflicts yourself, and push the result to either lilypond/translation
or master (pushing to both is better, but it's not essential)?
Thanks in advance
