Open Stack

I don't think we have to do anything to avoid merge conflicts - Anne?

If we get them, we resolve them -

I don't want to shut down a book tree - but Anne, what do you think?

Diane
----------------------------------------------
Diane Fleming
Software Developer II - US

diane.fleming at rackspace.com
Cell  512.323.6799
Office 512.874.1260
Skype drfleming0227
Google-plus diane.fleming at gmail.com






On 9/4/13 2:39 PM, "Andreas Jaeger" <aj at suse.com> wrote:

>On 09/04/2013 09:12 PM, Diane Fleming wrote:
>> Okay, that's fine with me.
>> 
>> I'll get rid of the parent doc/src/docbkx directories above the book
>> folders, and I'll eliminate src in those book dirs that have them.
>> 
>> Thanks!
>
>Great!
>
>How do you want to handle this to avoid merge conflicts? Should we
>freeze the tree for a few days and only do the moving around - and once
>a book has moved, lift the freeze for that book?
>
>Andreas
>-- 
> Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
>  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
>   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
>    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126