Git branching strategy integated with testing/QA process - Stack Overflow

标签： | 发表时间：2022-02-11 14:45 | 作者：
出处：https://stackoverflow.com

The way we do it is the following:

We test on the feature branches after we merge the latest develop branch code on them. The main reason is that we do not want to "pollute" the develop branch code before a feature is accepted. In case a feature would not be accepted after testing but we would like to release other features already merged on develop that would be hell. Develop is a branch from which a release is made and thus should better be in a releasable state. The long version is that we test in many phases. More analytically:

  1. Developer creates a feature branch for every new feature.
  2. The feature branch is (automatically) deployed on our TEST environment with every commit for the developer to test.
  3. When the developer is done with deployment and the feature is ready to be tested he merges the develop branch on the feature branch and deploys the feature branch that contains all the latest develop changes on TEST.
  4. The tester tests on TEST. When he is done he "accepts" the story and merges the feature branch on develop. Since the developer had previously merged the develop branch on feature we normally don't expect too many conflicts. However, if that's the case the developer can help. This is a tricky step, I think the best way to avoid it is to keep features as small/specific as possible. Different features have to be eventually merged, one way or another. Of course the size of the team plays a role on this step's complexity.
  5. The develop branch is also (automatically) deployed on TEST. We have a policy that even though the features branch builds can fail the develop branch should never fail.
  6. Once we have reached a feature freeze we create a release from develop. This is automatically deployed on STAGING. Extensive end to end tests take place on there before the production deployment. (ok maybe I exaggerate a bit they are not very extensive but I think they should be). Ideally beta testers/colleagues i.e. real users should test there.

What do you think of this approach?

相关 [git branching strategy] 推荐：

Git branching strategy integated with testing/QA process - Stack Overflow

- -
In case a feature would not be accepted after testing but we would like to release other features already merged on develop that would be hell. This is a tricky step, I think the best way to avoid it is to keep features as small/specific as possible.

Git基础

- Wolf - 潘魏增
上个月末在公司内部作了一次《Git基础》的主题分享. 这里把分享内容公布出来，希望对一些朋友有用. 如果之前没有接触过Git，wikipedia上面已经有非常好的介绍. pdf格式：http://panweizeng.com/download/git-basics-meituan.pdf. keynote格式：http://panweizeng.com/download/git-basics-meituan.key.

Git-rebase 小筆記

- lepture - YORKXIN×YORKXIN
最近剛好有個機會整理很亂的 Git commit tree，終於搞懂了 rebase 的用法，筆記一下. 大家都知道 Git 有個特色就是 branch 開很大開不用錢，但很多 branches 各自開發，總要在適當時機 merge 進去 master. 看過很多 git 操作指南都告訴我們，可以妥善利用 rebase 來整理看似很亂或是中途可能不小心手滑 commit 錯的 commits ，甚至可以讓 merge 產生的線看起來比較簡單，不會有跨好幾十個 commits 的線.

Git 简明教程

- satoru - python.cn(jobs, news)
Git 是一款强大的分布式版本控制系统.在他的官网可以找到已经有很多著名的项目正在使用. Like most other modern version control systems, Git gives each developer a local copy of the entire development history, and changes are copied from one such repository to another.

git架构图解

- - CSDN博客研发管理推荐文章
　　最近又遇到Git了，发现网络上Git的资料确实不咋滴，难懂不全面. 至于Git是什么我就不多说了，相比svn上手确实更难. 与svn集中版本库相比较，Git被称作分布式版本库，在分布式的版本库中任何一个库都可以作为中心库看待. 如果说svn是颗树，那么Git就像一张网. Svn在每个目录都有一个.svn文件夹存放信息，而git只在根目录才有，这就决定了svn可以单独拉取某个子目录或者某个文件，而git需要全部拉取.

科普：Git Commit Guidelines

- - IT瘾-dev
降低Review成本，可以明确知道本次提交的改变和影响. 规范整个Team的提交习惯，对技术素养的养成有益. 可以通过统一工具，抽取规范的message自动形成change log. 目前Github的Angular项目，就是完全采用规范的Git Message来进行日常的提交管理和发布管理的，下面是这个项目的Commit记录，和自动根据commit生成的change log.

一些 Git 設定偏好

- dylan - ihower { blogging }
讓 command line 指令列顯示目前處在哪一個 Git Brnach，最早是在 RGBA 看到這一招，非常方便. 請修改家目錄的 ~/.bashrc 或 ~/.bash_profile 檔案：. 記得打開 Git 的 color 設定，這樣 Git 指令的輸出結果才會加上顏色，像是 git status 等：.

Git和Mercurial(Hg)的分析

- gOODiDEA - 译言-电脑/网络/数码科技
来源Analysis of Git and Mercurial. 原文地址：http://code.google.com/p/support/wiki/DVCSAnalysis. （译者注：Mercurial以下简称Hg）. 注：这篇分析完成于2008年夏季，当时我们正第一次为Google Code支持DVCS而作的研究工作.

GoogleCode 的 git 使用小记

- Fstone - Gracecode.com
早先就知道 GoogleCode 支持 git，不过一直没时间体验. 近期实在受不了频繁的 svn commit 加上公司的联通网络访问 GoogleCode 实在是慢得让人无法忍受，于是咬咬牙想把 GoogleCode 中那陈年的代码迁移到 git 控制中. 总得来讲，设置 GoogleCode 项目中新的版本控制方案并不复杂，只需要在管理中点击需要的版本控制系统就行.

理解Git工作流

- joyoner - FeedzShare
来自: 黑客志 - FeedzShare  . 发布时间:2011年08月04日,  已有 2 人推荐. 如果你不了解Git背后的设计初衷，那么你正处在危险境地，当然有很多参数可以强迫Git按照你的意愿行事，但这并不是Git被设计的工作方式，这就好比你可以把改锥当锤子使用，并且它也可以完成工作，但这对改锥没什么好处.