git status
->git stash
->git status
->git fetch
->git rebase origin/develop
解冲突
->git add <fileName>
->git rebase --continue