Git管理from掘金

文章转载自https://div.io/topic/1772

分支示意图

origin/
  master                    // 线上版本
  |- hotfix-login           // 热修复,如登录异常
  release                   // 最新的要部署的版本
  develop                   // 开发分支
  |- feature-homepage-v2    // 正在开发的业务,如第二版的首页
  |- feature-timeline-api   // 正在开发的业务,如 Timeline 的 API

developer-ming
  master
  release
  develop
  |- feature-timeline-api   // 我正在开发这个 feature,不断和 origin 同步

新的业务

  1. 任何的一个新的业务开发都要在本地从 develop fork 出来一个新的 branch feature-name
  2. 业务开发完成后,提交 Pull Request,feature-name -> develop,记得打 label 到 feature
  3. Code Review,如果有错误,在 feature-name 里修复
  4. 相关负责人 Merge Pull Request,假删除这个分支

部署新的业务

  1. develop 上不断 merge 新的 review 过的业务功能
  2. 部署前,发 Pull Request 到 develop -> release
  3. 相关负责人 Code Review,合并代码
  4. npm run build 打包业务代码,准备部署
  5. 部署前的 commit,打 label 到 publish
  6. 发 PR 到 release -> master,标注版本号
  7. 部署,如果出错,回滚或者新建 hotfix 分支

小技巧

  1. developrelease 的同步,用 git rebase
  2. developfeature 分支不做 build 操作
  3. 多人负责一个 feature 的时候,可以就一个功能再分拆到各个 branches

更详细分支管理可见阮一峰博客https://www.ruanyifeng.com/blog/2012/07/git.html

Responses
  1. It's grteat that yyou are getting thoughts from this post as well as fro our argument made at this time. https://collegeapplicationessaywritingservice.info best paper writing service best paper wrriting service https://persuasiveessays.info https://writeessaysforme.info

    Reply
  2. Yes! Finally someone writes about cheap essay writing. https://writinganessay.info buy essays buy essays https://writinganessay.info https://writinganessay.info

    Reply
  3. An interesting discussion is definitely worth comment. I ddo believe that you should write more on this topic, itt may noot be a taboo subject but typically folks don't speak about these subjects. To the next! Kind regards!! https://essayserviceusukua.com last minute essay writing service last minute essay writinmg service https://essayserviceusukua.com https://essayserviceusukua.com

    Reply
  4. My developer is trying to convince me to move to .net from PHP. I hav always disliked the iidea because off the costs. But he's tryiong none the less. I've been using Movable-type oon several websites for aboutt a year and am anxious about switching too another platform. I have heard great things about blogengine.net. Is there a way I can import alll my wordpress content into it? Any kind of help would be greatly appreciated! https://buyessayonlinereviews.com best essaay writing service review best essay writing service review https://buyessayonlinereviews.com https://buyessayonlinereviews.com

    Reply
  5. Hey! I could have sworn I've been to this blog before bbut after checking through some of the post I realized it's new to me. Nonetheless, I'm definitely delighted I found it and I'll be book-marking and checking back frequently! https://writemyessaybest.com buy custom essay buy custom essay https://writemyessaybest.com https://writemyessaybest.com

    Reply
  6. My spouse and I stumbled over here different web address and thought I might check things out. I like what I see so i am just following you. Look forward to exploring your web page for a second time. https://writepapersforme.com essay writing help service essay writing help service https://writepapersforme.com https://writepapersforme.com

    Reply