git pull拉取文件时有冲突 Please commit your changes or stash them before you merge.