[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bad translation merge
From: |
David Kastrup |
Subject: |
Re: Bad translation merge |
Date: |
Wed, 07 Mar 2012 14:35:57 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
Julien Rioux <address@hidden> 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. 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.
Ugh! That sounds bad. I'll have to investigate further. All the
rebased commits would count as independent commits.
--
David Kastrup
- Re: Bad translation merge, (continued)
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Graham Percival, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Phil Holmes, 2012/03/07
- Re: Bad translation merge, Graham Percival, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
Re: Bad translation merge, Julien Rioux, 2012/03/07
Re: Bad translation merge, David Kastrup, 2012/03/07
Re: Bad translation merge, Francisco Vila, 2012/03/07