Re: [galaxy-dev] Merging files: Error merging filesglobal name 'shutil' is not defined

On Thu, Apr 25, 2013 at 1:40 PM, Dannon Baker <dannon.baker@gmail.com> wrote:

Hey Peter,

Thanks for the contributions, I've committed the changes to -central. You're definitely right about the merge failure not setting the job status to error, and I'm looking into that now.

-Dannon

Thanks - that's likely to be a slightly trickier issue to fix. Peter