launchpad-dev team mailing list archive

[Jonathan Lange <jml@xxxxxxxxxxxxx>]

On Thu, Jun 24, 2010 at 4:47 PM, Leonard Richardson
<leonard.richardson@xxxxxxxxxxxxx> wrote:
>
>> 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.
>
> I don't have a problem with this.

It's now done.

When you get a conflict from pulling, resolve it by deleting the directory.

jml