Re: [Rosegarden-devel] Trouble building logical instrument branch

[D. M. M. <mic...@ro...>]

On Tuesday, January 31, 2012, Tom Breton (Tehom) wrote:

> So clearly that's something I need to watch out for and co-ordinate.
> Michael, in the future, do I never remove a demo?  Or is there something I
> need to do?

I think that considering all the circumstances here, the simplest thing would 
probably be to just pick one file, say logical-segments-4.rg or whatever the 
current version is, and just keep switching it out from there, rather than 
working through a succession of logical-segments-n++.rg files.  It seems like 
that would simplify life for everyone.

The whole point of all of this nonsense was to avoid exactly the situation we 
find ourselves in, where somebody has added or removed files locally, and 
nobody else can build as a result.  It's obviously failing pretty hard.  I 
haven't looked at any of that in years, so if you have a better solution, I'm 
all for it.  I hate Git with a passion, and hate the idea of accommodating the 
wretched thing in even the smallest way, but then I'm just some guy who talks 
a lot, and you're actually doing a great deal of work, so if you need to do 
something to make your work more reasonable to accomplish, I'm not going to 
stand in your way.
-- 
D. Michael McIntyre