一、问题背景
今天用git pull来更新代码,遇到了下面的问题:
susanxiao:push_management jiangxingqi$ git pull origin master
From git.tv.sohuno.com:taotaoli/push_management
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
pom.xml
Please commit your changes or stash them before you merge.
Aborting