​​git pull --rebase​​报错

error: cannot pull with rebase: Your index contains uncommitted changes.

error: please commit or stash them.

解决方案：修复冲突


  • ​​git stash​​
  • ​​git pull --rebase​​
  • ​​git stash pop​​

然后就可以提交了

提交步骤


  • ​​git status​​
  • ​​git pull​​
  • ​​vi file-demo​​
  • ​​git add file-demo​​
  • ​​git commit​​
  • ​​git push​​
  • ​​git status​​