David Kastrup <d...@gnu.org> writes: > Hi, the recent translation merge apparently made some wrong choices when > dealing with merge conflicts. Changes in staging have been overwritten > in the following files:
> And that affects a lot more than just translations. I have removed that > commit from origin/staging, and we'll have to investigate what > happened. Francisco, do you remember the commands you used for merging > translation into staging? I'll try repeating this on my own and see > whether I can reproduce this. 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 will try to figure out what happened here. Please don't merge the translation branch to staging while I try figuring this out. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
