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

GIT error: The following untracked working tree files would be overwritten…
unknown what’s the error

1.backup the whole www directory
  zip -r /home/wwwroot/www
  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 -d wwwtmp
  cp -arf /home/wwwroot/wwwtmp/Uploads/*  /home/wwwroot/www/Uploads