Skip to main content

One post tagged with "mainline"

View all tags

Trunk-Based Development

· 5 min read
David Puziol Prata
DevOps at @ Encora

Hello everyone!

We usually use some git flow as a development strategy in our teams. Normally 3 branches:

  • main or master
    • Code running in production
    • Protected
    • Usually used only for deployment, as all tests were done on the staging branch.
  • staging or release
    • Code running in staging environment (pre-production)
    • Protected
    • Used for functionality tests in real conditions, bug and problem detection, configuration validation, integration testing, load testing, etc.
  • develop
    • Sum of new features from all teams and hotfixes found in production.

We usually have a flow similar to this which is the idea of gitflow and very well accepted nowadays.