问题:在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 <file>..." to include in what will be committed)
.zephyr-env.sh.swn
git rm .zephyr-env.sh.swn 失败,
解决办法:执行git clean -f ,不行用git clean -d -fx
————————————————
版权声明:本文为CSDN博主「C_HW」的原创文章,遵循 CC 4.0 BY-SA 版权协议,转载请附上原文出处链接及本声明。
原文链接:https://blog.csdn.net/qq_24846887/article/details/95495136