ember build fail on gitkeep

[koryteg]

im getting this error while running any of the ember commands. I am on ember-cli 0.2.0-beta.1

Build failed.
Merge error: file .gitkeep exists in /Users/korytegman/workspace/apppddd/node_modules/ember-idx-modal/vendor and /Users/korytegman/workspace/apppddd/tmp/tree_merger-tmp_dest_dir-DtF1OI88.tmp
Pass option { overwrite: true } to mergeTrees in order to have the latter file win.

[koryteg]

sorry, looks like ember-cli 0.2.0-beta.1 broke most addon and they need to be refactored to use the setupPreprocessorRegistry hook . https://github.com/ember-cli/ember-cli/releases

[tehmaestro]

Hey, I just found this addon and I wanted to confirm that I'm getting the same thing.

[mantenie]

I have the same! Deleting the .gitkeep file helps.
Is the vendor directory necessary?

[wayne-o]

Deleting all of the .gitignore files below the package folder fixed it for me so I can carry on working but this is obviously not the right fix - what's involved in patching this?