Alex Blewitt <alex.blewitt@gmail.com>

Suggested

r861130

r861130 | markphip | 2006-08-12 12:55:26 +0000 (Sat, 12 Aug 2006)

* www/faq.html (obstructed-add): Describe how to handle an update 
  that cannot add a file because local file already exists.  Can
  easily happen after submitting a patch and not removing files
  from working copy.

Suggested by: Alex Blewitt <alex.blewitt@gmail.com>