andreasgal/B2G — Issue #184: make sync failing on untracked Android.mk
Author: benfrancis
Created: 2012-02-17 18:30:54+00:00
State: open

Earlier today fabrice reported a problem with make sync returning these errors http://pastebin.mozilla.org/1486325

He says it's working again for him now, but when I run make sync I get:

git pull origin master
From https://github.com/andreasgal/B2G
* branch master -> FETCH_HEAD
Updating 976666d..be14c34
error: Untracked working tree file 'glue/gonk/dalvik/libnativehelper/Android.mk' would be overwritten by merge. Aborting
make: *** [sync] Error 1