Capistrano

"would be overwritten by merge. Cannot merge."

Git tells you which file it is. Use git status to see if it is added but not committed. Commit it. Do the merge again. It'll probably work.

In the future, check your local state before pulling (or performing an Agaric Capistrano task that includes pulling a commit back down locally).

The error:

To get an agaric project repository, without the helper script, it's simply: git clone git.agariclabs.org:/srv/git/whoswho.git

And get the current version of the script at https://gitorious.org/agaric-scripts