入职一周后,我终于有产出了。。虽然上传不到半小时就出了bug。。什么时候能改掉毛手毛脚的毛病
记录一下完整推上线以及分支管理等等操作。
先从master上拉个feature分支到本地:
git checkout -b feature/20190708-keyrouter
在本地哼哧哼哧敲代码完成后,先add到暂存区:
git add (+文件名)
commit到工作区:(随时可以查一下状态:git status)
git commit -m "备注"
切到master线上拉取最新master:
git checkout master
git pull
切到feature分支,把master合进来:
git checkout feature/20190708-keyrouter
git merge master
切到master分支新建一个release分支并切回release:
git checkout master
git checkout -b release/20190709-motifykeywordrouter
切到feature分支把release合进来:
git checkout feature/20190708-keyrouter
git merge release/20190709-motifykeywordrouter
切到release分支把feature合过去:
git checkout release/20190709-motifykeywordrouter
git merge feature/20190708-keyrouter
推到远程:
git push origin release/20190709-motifykeywordrouter:release/20190709-motifykeywordrouter