I spent my whole afternoon in trying to force the git-machinery to move the .htaccess in the right final directory. Eventually I gave up to the task, postponing everything to tomorrow and restoring the original conf.py. Magically the git-machinery moved the .htaccess in its final position. But now I'm almost sure the the pages will be locked for all because the .htpasswd is not in the right position now!