<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; color: rgb(0, 0, 0); font-size: 14px; font-family: Calibri, sans-serif; ">
<div>
<div>
<div>That sounds good – I'll take care of it this weekend.</div>
<div>
<div>
<div style="color: rgb(0, 0, 0); "><font class="Apple-style-span" color="rgb(0, 0, 0)" face="Apple Chancery"><i>Diane</i></font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; color: rgb(0, 0, 0); ">
<font class="Apple-style-span" color="rgb(0, 0, 0)"><i>----------------------------------------------</i></font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; color: rgb(0, 0, 0); ">
<font class="Apple-style-span" color="rgb(0, 0, 0)">Diane Fleming</font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; ">
<div style="color: rgb(0, 0, 0); ">Software Developer II - US</div>
</div>
diane.fleming@rackspace.com</div>
<div>Cell 512.323.6799</div>
<div>Office 512.874.1260<br>
<span class="Apple-style-span" style="font-family: Calibri, sans-serif; ">
<div style="font-family: Calibri, sans-serif; font-size: 14px; ">
<div style="color: rgb(0, 0, 0); ">Skype drfleming0227</div>
<div style="color: rgb(0, 0, 0); ">Google-plus diane.fleming@gmail.com</div>
</div>
</span></div>
</div>
</div>
</div>
<div><br>
</div>
<span id="OLK_SRC_BODY_SECTION">
<div style="font-family:Calibri; font-size:11pt; text-align:left; color:black; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; PADDING-BOTTOM: 0in; PADDING-LEFT: 0in; PADDING-RIGHT: 0in; BORDER-TOP: #b5c4df 1pt solid; BORDER-RIGHT: medium none; PADDING-TOP: 3pt">
<span style="font-weight:bold">From: </span>Anne Gentle <<a href="mailto:annegentle@justwriteclick.com">annegentle@justwriteclick.com</a>><br>
<span style="font-weight:bold">Date: </span>Wednesday, September 4, 2013 3:07 PM<br>
<span style="font-weight:bold">To: </span>Diane Fleming <<a href="mailto:diane.fleming@rackspace.com">diane.fleming@rackspace.com</a>><br>
<span style="font-weight:bold">Cc: </span>Andreas Jaeger <<a href="mailto:aj@suse.com">aj@suse.com</a>>, "<a href="mailto:openstack-docs@lists.openstack.org">openstack-docs@lists.openstack.org</a>" <<a href="mailto:openstack-docs@lists.openstack.org">openstack-docs@lists.openstack.org</a>><br>
<span style="font-weight:bold">Subject: </span>Re: [Openstack-docs] Folder renaming in openstack-manuals<br>
</div>
<div><br>
</div>
<div>
<div>
<div dir="ltr"><br>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Wed, Sep 4, 2013 at 2:49 PM, Diane Fleming <span dir="ltr">
<<a href="mailto:diane.fleming@rackspace.com" target="_blank">diane.fleming@rackspace.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
yep, I got it!<br>
<br>
I'll talk to Anne about the best way to handle this.<br>
<br>
Perhaps I can do it Saturday morning to reduce the interruption in<br>
workflow.<br>
<div class="im HOEnZb"><br>
</div>
</blockquote>
<div><br>
</div>
<div>I was going to suggest, how about this weekend before the docs boot camp? </div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="im HOEnZb">Diane<br>
----------------------------------------------<br>
Diane Fleming<br>
Software Developer II - US<br>
<br>
<a href="mailto:diane.fleming@rackspace.com">diane.fleming@rackspace.com</a><br>
Cell <a href="tel:512.323.6799" value="+15123236799">512.323.6799</a><br>
Office <a href="tel:512.874.1260" value="+15128741260">512.874.1260</a><br>
Skype drfleming0227<br>
Google-plus <a href="mailto:diane.fleming@gmail.com">diane.fleming@gmail.com</a><br>
<br>
<br>
<br>
<br>
<br>
<br>
</div>
<div class="HOEnZb">
<div class="h5">On 9/4/13 2:44 PM, "Andreas Jaeger" <<a href="mailto:aj@suse.com">aj@suse.com</a>> wrote:<br>
<br>
>On 09/04/2013 09:42 PM, Diane Fleming wrote:<br>
>> I don't think we have to do anything to avoid merge conflicts - Anne?<br>
>><br>
>> If we get them, we resolve them -<br>
>><br>
>> I don't want to shut down a book tree - but Anne, what do you think?<br>
><br>
>My understanding is that if I change a file in my patch and you move it<br>
>around, I need to apply the patch to the new file. Should be a trivial<br>
>action on my side. But if I know that you're moving files massively<br>
>around, I would try to keep out of your way and wait with sending in<br>
>patches until everything has settled.<br>
><br>
>Andreas<br>
>--<br>
> Andreas Jaeger aj@{<a href="http://suse.com" target="_blank">suse.com</a>,<a href="http://opensuse.org" target="_blank">opensuse.org</a>} Twitter/Identica: jaegerandi<br>
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany<br>
> GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)<br>
> GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126<br>
<br>
<br>
_______________________________________________<br>
Openstack-docs mailing list<br>
<a href="mailto:Openstack-docs@lists.openstack.org">Openstack-docs@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs</a><br>
</div>
</div>
</blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
Anne Gentle<br>
<a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a></div>
</div>
</div>
</div>
</span>
</body>
</html>