Re: Conflicts, conflicts everywhere

[Graham Percival]

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 for us is now to commit
> and push our own changes, but either I don't understand it well or
> Neil's updates are always made in the meantime between two merges, so
> these changes are being made always in both branches simultaneously
> which leads to hundredths of conflicts.

Sorry, I'm missing something.  Shouldn't lilypond/translation only
be touching input/texidocs/ ?  And shouldn't input/lsr/ only be
updated by Neil (or whoever) running makelsr.py on master?

Cheers,
- Graham