Your local changes would be overwritten by merge. Commit, stash or revert th

1. 隐藏
git stash
git pull
git stash pop

2.直接commit
git commit -m "one"