launchpad-dev team mailing list archive

[Maris Fogels <maris.fogels@xxxxxxxxxxxxx>]

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.

Since the apidoc directory under version control is empty, can remove it from 
the repository and generate it at build time?  That would eliminate these merge 
conflicts once and for all.  It would solve our accidental deletion problems too.


Maris