将本地branch basic提交到remote的basic上:
git push origin basic:basic
将remote的 basic branch更新到本地的 basic branch上:
git fetch
git merge basic
(尽量不要用 git pull,会隐藏很多细节)