On Thu, Jun 24, 2010 at 4:47 PM, Leonard Richardson <[email protected]> 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 _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
