Julien Rioux <julien.ri...@gmail.com> writes:
> David Kastrup <dak <at> gnu.org> writes:
>> I can reproduce the problems when merging. It would appear that the
>> history of the translation branch got messed up at some point of time in
>> a manner that git can't recognize how to merge properly anymore.
>
> I don't know if this can help you, but I noticed the following. Usually
> master is merged into lilypond/translation and then lilypond/translation
> is merged into master.
It should be merged into _staging_ (which will eventually pass into
master). I don't remember any chaos with regard to staging->master, so
tampering with master was not likely a problem.
> If you look at the history about 11 days ago, you can see that master
> was merged into lilypond/translation, so far so good, but then it
> looks like lilypond/translation~0 was rebased on top of master,
> instead of merged into master.
I see rebasing commits like
commit 24f5f986998c23a1cbac15024d58ca6497093cce
Author: Julien Rioux <jri...@physics.utoronto.ca>
Commit: Francisco Vila <francisco.v...@hispalinux.es>
Doc-de: Compilation fix for de/notation.
commit 12cfe6bafb8589b0780df84fb36981994ee8793a
Author: Till Paala <till.ret...@gmx.de>
Commit: Francisco Vila <francisco.v...@hispalinux.es>
Doc-de: update the noation manual, adding snippet translations
which also appear in a version committed by their actual authors.
That's definitely not good. But I don't see how this would explain the
_loss_ of changes. Digging further.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
