准备开发:
git fetch
git checkout develop(切换到开发分支)
git flow feature start newbranchName (创建开发分支)
git push origin feature/newbranchName(推送开发分支到远端)
进入开发:
git fetch
git checkout feature/newbranchName(切换到开发分支)
开发ing········
git add .
git commit -m "注释"
git push origin feature/newbranchName
开发完毕后:
git fetch
git rebase origin/develop(从远程公有仓库拉取代码)
常规的合并分支到master上
git add .
git commit -m "branchName"
git push -u origin branchName
git checkout master
git pull
git merge branchName
git status
git push origin master