Re: Conflicts, conflicts everywhere

[Francisco Vila]

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 sane).

2009/6/9 Francisco Vila <address@hidden>:
> 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. ...
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org