error: Untracked working tree file ‘newAdmin/Application/Admin/Conf/config.php’ would be overwritten by merge. Aborting

https://git-scm.com/docs/git-clean

GIT error: The following untracked working tree files would be overwritten…


http://blog.csdn.net/qing101hua/article/details/46312795
unknown what’s the error

 
 
1.backup the whole www directory
  zip -r 20170928www.zip /home/wwwroot/www
 
2.
  git clean -d -fx
  git pull origin master (or whatsoever)
 
  -f force
  -x Don’t use the standard ignore rules read from .gitignore
  -d Remove untracked directories in addition to untracked files.
 
3. restore Uploads directory to www/Uploads
  mkdir wwwtmp
  unzip 20170928www.zip -d wwwtmp
  cp -arf /home/wwwroot/wwwtmp/Uploads/*  /home/wwwroot/www/Uploads

Related posts:

Leave a Reply

Your email address will not be published.