1、git pull报错: The following untracked working tree files would be overwritten by merge:
分析原因:
untracked working tree files
$ git clean -d -fx
$ git pull origin master
2、error: Cannot pull with rebase: You have unstaged changes.error: Additionally, your index contains uncommitted changes.
分析原因:如果有未提交的更改,是不能git pull的
$git stash
$git pull –rebase
$git stash pop