[Opensim-dev] GIt master is broken until further notice

[Mike Chase]

On Sat, 2013-12-14 at 14:59 +0700, Akira Sonoda wrote:
> It is not a problem of distributed version control Mike. IMHO such
> things can be done properly. For example:
> http://nvie.com/posts/a-successful-git-branching-model/
> 
> Most git tools like SourceTree or SmartGit nowadays have builtin git
> flow support.
> 
> 
> Akira
> 
> 
Sorry Akira.  I was being sarcastic.  Probably not constructive.  My
real point was exactly that git and DSCM systems provide the tools to
manage such a merge without breaking HEAD and affecting other
developers. I very much agree the tools exist to manage it.

Mike
> 
> 2013/12/11 Mike Chase <mike.chase at alternatemetaverse.com>
>         O.o
>         
>         So much for distributed version control.  Hopefully the
>         changes are
>         worth it.
>         
>         Mike
>         
>         
>         On Tue, 2013-12-10 at 18:05 -0800, Dahlia Trimble wrote:
>         > Melanie has begun merging her region crossing code into git
>         master and
>         > expects that the changes will break the repository for some
>         indefinite
>         > period. The last usable commit was
>         > 08750501617ca332ab196b2f25030e3c635c9dd6 made on December
>         10th. Please
>         > do not use commits after this until master is fixed.
>         >
>         >
>         > -dahlia
>         >
>         
>         > _______________________________________________
>         > Opensim-dev mailing list
>         > Opensim-dev at lists.berlios.de
>         > https://lists.berlios.de/mailman/listinfo/opensim-dev
>         
>         
>         _______________________________________________
>         Opensim-dev mailing list
>         Opensim-dev at lists.berlios.de
>         https://lists.berlios.de/mailman/listinfo/opensim-dev
> 
> 
> _______________________________________________
> Opensim-dev mailing list
> Opensim-dev at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/opensim-dev