git merge goodslist报错

git merge goodslist报Please commit your changes or stash them before you merge.

可以搜一下git stash的用法，暂存你修改的内容，拉了master分支之后再合并并解决冲突