[Openstack-docs] Folder renaming in openstack-manuals

Andreas Jaeger aj at suse.com
Wed Sep 4 19:44:55 UTC 2013


On 09/04/2013 09:42 PM, Diane Fleming wrote:
> 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?

My understanding is that if I change a file in my patch and you move it
around, I need to apply the patch to the new file. Should be a trivial
action on my side. But if I know that you're moving files massively
around, I would try to keep out of your way and wait with sending in
patches until everything has settled.

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



More information about the Openstack-docs mailing list