在使用git更新命令时,产生错误:
fatal: Untracked working tree file 'res/values/isdm_mms_defaults.xml' would be overwritten by merge.
请问这个错误是什么原因引起的?该怎么解决呢?
fatal: Untracked working tree file 'res/values/isdm_mms_defaults.xml' would be overwritten by merge.
请问这个错误是什么原因引起的?该怎么解决呢?
解决方案 »
- 新人求帮助
- 给RelativeLayout添加onclicklistener的问题
- 旋转屏幕后,如何恢复多选数据
- 快进来看看
- weibo4android运行的时候,出现问题
- AndroidManifext.xml读取
- 开发的android应用程序不在程序显示中显示
- Android模拟器横竖屏不能切换,太奇怪了!!!
- AsyncTask 多线程并发导致Fatal signal 11 (SIGSEGV)
- 请问高手如何显示半张图片(一半在屏幕外面)
- 问下做Android开发目前以何种语言为主?
- tabhost.setup(this.getLocalActivityManager());这一行代码报空指针异常
other branch, you really should have a few different cases: - you have a dirty file, and git should say something like error: You have local changes to 'file'; cannot switch branches. because it refuses to modify the file to match the other branch (which
includes removing it) if it doesn't match the index. So this case shouldn't leave anything behind. - You have that extra file, but it's not in the index. If it's in your current HEAD, we should still notice it with something
like: error: Untracked working tree file 'tree' would be removed by merge. because now it's untracked (not in the index), but the switching
between branches tries to essentially "apply" the difference between
your current HEAD and the new branch, and finds that the difference
involves removing a file that git isn't tracking.