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 difficult to find educated people on this subject, but you sound like you know what you're talking about! Thanks

    Reply
  2. Have you ever thought about adding a little bit more than just your articles? I mean, what you say is important and all. However think about if you added some great images or video clips to give your posts more, "pop"! Your content is excellent but with pics and clips, this website could certainly be one of the very best in its field. Terrific blog!

    Reply
  3. I'm really loving the theme/design of your site. Do you ever run into any web browser compatibility problems? A handful of my blog visitors have complained about my blog not working correctly in Explorer but looks great in Chrome. Do you have any recommendations to help fix this issue?

    Reply
  4. Hi, Neat post. There's a problem together with your web site in internet explorer, would check this? IE still is the market chief and a big section of people will omit your magnificent writing because of this problem.

    Reply
  5. Everything is very open with a really clear explanation of the issues. It was definitely informative. Your website is extremely helpful. Thanks for sharing!

    Reply
  6. What's up, yes this piece of writing is really fastidious and I have learned lot of things from it about blogging. thanks.

    Reply