[oe] Reconsidering the work flow and how the SCM system fits in

[Holger Freyther]

On Tuesday 11 March 2008 11:38:07 Koen Kooi wrote:
> Graeme Gregory schreef:


> * track .dev: mtn propagate org.openembedded.dev org.openmoko.needmorebru

Non content conflict. ugh! What to do now?

And this has happened with the dreambox branch and this is why I can't 
encourage anyone to use branches with monotone. Even if there is some kind of 
management issue with whatever branch, the tool should not punish this by not 
being able to manage, it is a tool and it should do what it is meant ot be: 
Allow distributed development, and not being able to merge is defeating this 
purpose.