nexcess/magento-turpentine — pull request #1 by aschroder (2012-10-24 03:43:46+00:00)
Title: Update modman file to set the filename for the module file.

I get this error when deploying with modman:
CONFLICT: app/etc/modules/ mapped by app/etc/modules/Nexcessnet_Turpentine.xml already exists and is not a link.
app/etc/modules/Nexcessnet_Turpentine.xml app/etc/modules/

This fixes it.