出错内容:
root@DESKTOP-U3E85G8:~/project/service-common# repo sync .
Fetching: 100% (1/1), done in 2.223s
Garbage collecting: 100% (1/1), done in 0.133s
info: A new version of repo is available
warning: repo is not tracking a remote branch, so it will not receive updates
repo reset: error: Entry 'subcmds/diff.py' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'v2.28^0'.
查看本地分支关联的远程分支,看着正常,如下:
root@DESKTOP-U3E85G8:~/project/service-common# git config --list
branch.master.remote=origin
branch.master.merge=refs/heads/master
解决:
进入对应的.repo/repo目录,拉起最新的repo代码分支:
root@DESKTOP-U3E85G8:~/project/.repo/repo# git pull