launchpad-dev team mailing list archive

[Aaron Bentley <aaron@xxxxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/22/2010 12:18 PM, Maris Fogels wrote:
> Hi Leonard,
> 
> lib/canonical/launchpad/apidoc keeps giving me merge conflicts when I
> use rocketfuel-get to update it.  These are caused by the many
> accidental deletions and re-additions of this directory.  It is really
> annoying.

It's weird that people are accidentally deleting directories, but it's
really disturbing that people are accidentally adding directories.  How
is this happening?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwg5cgACgkQ0F+nu1YWqI3WXgCfRPpvBpU5UvS0oA3R4JgbkSBh
upwAnAu6j+j6WunOLGyHV02eAhZWy+JT
=OAMC
-----END PGP SIGNATURE-----