Git切换分支报错:error: you need to resolve your current index first 以及needs merge

当想从子分支切换到dev分支时git checkout dev
报错:
error: you need to resolve your current index first
xxx.java: needs merge
xxx.xml: needs merge

解决办法:git reset --merge
然后再次git checkout dev

出现:问题解决!
Switched to branch ‘dev’
Your branch is up to date with ‘origin/dev’.

猜你喜欢

转载自blog.csdn.net/qq_42999949/article/details/114299526