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"

　　

posted @ 2020-03-25 19:19  辰梓悦  阅读(882)  评论(0)  编辑  收藏  举报