在master分支上无法合并
Topic source你仔细读git的出错信息：
error: The following untracked working tree files would be overwritten by merge: readme.txt Please move or remove them before you can merge.
就是说你的工作区有一个untracked状态的readme.txt，但是merge后它将被覆盖，所以要你先删除或者把这个文件移到别的地方
- 1
mickey_laoshu
在操作的过程遇到了如下问题，不知道该如何解决，希望有大神能帮看下，不胜感激～ 当我新建dev分之后并修改了readme文件，add，commit后，切换到master分支后无法合并，报如下错误：
git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master'. ➜ gitskills git:(master) vim readme.txt ➜ gitskills git:(master) ✗ git merge dev Updating 4ef33d4..ebe8e5d error: The following untracked working tree files would be overwritten by merge: readme.txt Please move or remove them before you can merge.