On Tue, Jun 09, 2009 at 12:27:49PM +0200, Francisco Vila wrote:
> This is driving me mad. I think that, with the new policy of
> committing our own changes to input/lsr it is impossible to avoid
> conflicts between lilypond/translation and master.
...
> But now comes the issue of LSR, whose policy
2009/6/9 John Mandereau :
> Except that I've been more idle on merging lately, not only because I've
> been busy, but because I described the merging policy in the Contributors'
> Guide and at least you are able to apply it.
Yes but it is still a bit difficult to see the whole frame, I'm sorry.
>
2009/6/9 John Mandereau :
> Francisco Vila a écrit :
>>
>> BTW is it possible that branches have diverged because of the
>> breakdown of savannah, and I am having conflicts despite of branches
>> having been merged recently? IIRC git told me exactly that but I
>> ignored it.
>
> It's possible. Did
Francisco Vila a écrit :
BTW is it possible that branches have diverged because of the
breakdown of savannah, and I am having conflicts despite of branches
having been merged recently? IIRC git told me exactly that but I
ignored it.
It's possible. Did you pull master with -r flag before changin
Francisco Vila a écrit :
This is driving me mad. I think that, with the new policy of
committing our own changes to input/lsr it is impossible to avoid
conflicts between lilypond/translation and master.
It's not impossible, but it is more difficult... :-/ more below.
Besides, frequent mer
BTW is it possible that branches have diverged because of the
breakdown of savannah, and I am having conflicts despite of branches
having been merged recently? IIRC git told me exactly that but I
ignored it. I am going to fetch a fresh repo to be sure (if and only
if the repo now in savannah is san
This is driving me mad. I think that, with the new policy of
committing our own changes to input/lsr it is impossible to avoid
conflicts between lilypond/translation and master.
Sooner or later, all the changes and updates made to the
lilypond/translation branch will have to be merged into master,
