yeoman/generator — pull request #270 by stephenplusplus (2013-06-04 22:05:14+00:00)
Title: base/run async conflicter resolved.

(#269)

```js
self.conflicter.resolve(function (err) {
if (err) {
return self.emit('error', err);
}
});
```

That block was called from base.js/run before giving the files a chance to be added to the conflicter. Thus, callbacks bound to the `resolved:___` event weren't firing, and everything was locking up.