git status总是提示Untracked files：

问题：在repo sync时总是提示

error: zephyr/: branch master is published (but not merged) and is now 1 commits behind

git diff为空，git status显示有文件修改。

Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Untracked files:
  (use "git add ..." to include in what will be committed)

    .zephyr-env.sh.swn

git rm .zephyr-env.sh.swn 失败，

 

解决办法：执行git clean -f ，不行用git clean -d -fx