Add extra branch to Git Flow merges

bertoost2

We have a setupped branches like

• master -> Production site
• develop -> Development stable
• test -> Test site

Also using Git Flow for our project(s). Which really is great to have.

The thing is; when you finish a feature/hotfix, it's being merged to develop and master, which is great. Only I am wondering if it's also possible to include our test branch here too?

Can I just add "test = test" to the git config or is this not going to work either?

Thanks in advance.

Seth

If you are using gitflow, you should have 3 prefixes to work with: feature, hotfix, and release.

Feature should only merge to develop. Hotfix and Release should merge into both master and develop.

The point of "release" prefixed branches is to test. Instead of having a pre-defined permanent branch to deploy to your test site, I'd recommend deploying the current release/* branch to the test site. When there are failures, commit the fixes to the release/* branch. When the release is successfully validated, you finish it and it merges to develop and master.