2012/10/30 David Kastrup <[email protected]>: > Francisco Vila <[email protected]> writes: > >> 2012/10/28 David Kastrup <[email protected]>: >>> 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 _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
