git协同办公流程/使用git进行开发

git remote add upstream http://xxx.git

git fetch upstream

git rebase upstream/master

git push origin

git checkout -b f/#number/spike 

working...

commit...

git checkout master

git fetch upstream

git rebase upstream/master

git push origin

git checkout f/#number/spike 

git rebase master

解决冲突...一般选择income change

git checkout master

git checkout -b f/#number/release

git merge --squash f/#number/spike

=>commit内容为issue的title
=>勾选Push
=>刷新gitlab页面
=>点击merge request按钮
=>选择提交选项
=>点击submit merge request完成。

---

更多内容欢迎访问 lipk.org

---