Cannot merge error message from Git likely due to an added but uncommitted file

"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).