Removing the two files in question and rerunning 'repo sync' seems to have fixed it. That said, how/why did this happen? Was this the correct solution?
On May 27, 7:24 am, Gary Thomas <samoht.y...@gmail.com> wrote: > Trying to 'repo sync' into a tree which was fine last Friday: > > From git://android.git.kernel.org/platform/system/wlan/ti > * [new tag] android-1.5r2 -> android-1.5r2 > Fetching projects: 100% (115/115), done. > Syncing work tree: 59% (67/113) fatal: Untracked working tree file > 'docs/html/sdk/1.0_r1/requirements.jd' would be overwritten by merge. > Syncing work tree: 76% (86/113) fatal: Untracked working tree file > 'res/drawable/wallpaper_lake.jpg' would be overwritten by merge. > Syncing work tree: 100% (113/113), done. > > error: frameworks/base/: platform/frameworks/base checkout refs/ > remotes/korg/cupcake > error: packages/apps/Launcher/: platform/packages/apps/Launcher > checkout refs/remotes/korg/cupcake > > How do I work around this? --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Android Developers" group. To post to this group, send email to android-developers@googlegroups.com To unsubscribe from this group, send email to android-developers-unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/android-developers?hl=en -~----------~----~----~----~------~----~------~--~---
