标题：[实践OK]The following untracked working tree files would be overwritten by merge
出处：向东博客 专注WEB应用 构架之美 --- 构架之美，在于尽态极妍 | 应用之美，在于药到病除
时间：Tue, 26 Sep 2017 17:34:29 +0000
作者：jackxiang
地址：https://jackxiang.com/post/9471/

内容：
我的问题：git pull
error: Untracked working tree file 'playbook/ml.qr.justwinit.cn/process.yml' would be overwritten by merge.  Aborting
git fetch --all && git reset --hard origin/master
一、解决办法：

$git fetch --all && git reset --hard origin/master
Fetching origin
HEAD is now at d33031a edit dns playbook


二、再git pull就没有问题了，当然，你的改动也被回退了，得先备份再做这个操作：
$git pull
Already up-to-date.

三、重新将文件放进去，再进行commit后push，没毛病：
git commit -m"xxx" ishow.justwinit.cn.conf.j2 
git push
Counting objects: 11, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 815 bytes, done.
Total 6 (delta 3), reused 0 (delta 0)
To git@gitlab.qr.cntv.net:irdcops/ansible.git
   d33031a..eb4ad86  master -> master
来自：https://www.codecaptain.io/reference/git/the-following-untracked-working-tree-files-would-be-overwritten-by-merge


Generated by Jackxiang's Bo-blog 2.1.1 Release