error: cannot pull with rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: please commit or stash them.
需要转移分支修改过代码,使用
git stash
git pull --rebase
git stash pop
后面步骤和正常提交流程一样,git add -> git commit -> git push