在使用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.
请问这个错误是什么原因引起的?该怎么解决呢?
解决方案 »
- Android开发中jsoup解析网页的问题,高手请进,急急急!!!
- 求助:关于用Intent传递List<>类型的问题
- remoteviews如何里取得某个控件的属性?
- android pin解鎖不成功
- android 延迟加载
- Android 指定一个文件搜索文件里面的所有文件大小
- android 不能正常运行了 运行的时候就是debug状态
- 新手:setContentView(R.layout.activity_main);问题
- android开发自定输入法。
- 16位二进制数如何转换成24位十六进制数?如何用不断变化的十六位进制数动态的设置画笔颜色?
- 问下做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.