[Opensim-dev] DVCS's

[Edward Middleton]

Frisby, Adam wrote:
> That said, DSVC is not a panacea to programming. Git is better than SVN at merging files; but it's still not excellent - Melanie puts in a ton of work each week in managing our various branches and bringing them together, conflicts and all. 
>   

What is the work flow Melanie is using.  Most projects seem to go with a
recognized authority which everyone rebases their changes against until
the changes are clean, and stable enough to be integrated.  In that way
the work of integrating changes is distributed rather then centralized.

Edward