6.2 Branching Strategy

We use a simplified Git flow that balances the need for feature isolation with the reality of working on client projects with varying complexity levels. The main branch always represents production-ready code, while feature branches allow developers to work on specific functionality without affecting the stable codebase.

Feature branches should be named descriptively to indicate their purpose, such as feature/contact-form-validation or fix/mobile-navigation-issue. This naming convention makes it easy to understand what each branch contains and helps when reviewing pull requests.

When starting work on a new feature, developers create a branch from the latest primary branch. Regular merging of primary into feature branches prevents large merge conflicts and ensures that features are developed against the most current codebase.