git checkout master
git checkout -b featurebranch
git add -A
git commit -am "funky stuff"
git push origin featurebranch
有人更新了导致featurebranch冲突的master，所以我们无法合并所以需要做一个rebase
git checkout master
git pull origin master
git checkout featurebranch
git rebase master
git push -f origin featurebranch --no-one else uses this branch so -f is fine
如果某人已经取消了功能分支并且你已经完成了一次改变并希望推动该怎么办？你会得到：
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
那么现在的工作流程是什么？