How do I use git flow with a staging environment?

git branching-and-merging git-flow
Eric picture Eric · Apr 15, 2013 · Viewed 8.4k times · Source

We are using git-flow to handle hotfixes & features, with a develop branch & the master branch (for production).

What is the easiest way to add a staging branch to the mix so that we can validate work that is on its way to production from develop while still keeping the helpfulness of git-flow?

Answer

Klas Mellbourn picture Klas Mellbourn · Apr 15, 2013

I would say that staging should be based on a git flow release branch. After a git flow release start and git flow release publish you can start QA work on that branch, including deploying it to a staging area. When the QA work in the staging area has proven the code ready for production deploy in production and do git flow release finish.

If you are using TeamCity, you can easily set up the server to detect new remote release branches and automatically set up builds for them, see here.

Related questions

How should Git Flow work with QA testing both a release and a new feature?

We are using Git Flow on our latest iOS project and I am trying to work out a way of working with QA so that they can test the latest release, as well as testing a new feature, without having …

Read More
How to undo git flow feature finish?

I am learning git-flow and I just did git flow feature finish <feature-name>, which merged my feature branch to develop and removed it. Instead of this, I want to push the feature branch to github, so I can …

Read More
What is the best (and safest) way to merge a Git branch into master?

A new branch from master is created, we call it test. There are several developers who either commit to master or create other branches and later merge into master. Let's say work on test is taking several days and you …

Read More