赞
踩
idea使用GIT pull项目是时报错Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree
原因是自己更新的代码没有push到项目,只需要push项目在pull就可以了