Branch Strategy

Overview

For the Tech-Trend-Emporium backend, we are following the Git-flow branching strategy to manage our repository. This ensures a smooth workflow and keeps the codebase stable.

Main Branches:

• Main: The main branch contains production-ready code. No direct commits are allowed. All changes must go through Pull Requests (PRs) and require at least two approvals.

• Develop: The develop branch is where features are integrated before they are merged into release. All features should be merged into develop via PRs once they are ready.

• Release The release branch is where we adjust the code to be merged into main, our production branch.

Supporting Branches:

• Feature: Each new feature or task will have its own branch derived from develop. The naming convention for feature branches is feature/feature-name.

• Hotfix: These branches are used for emergency fixes to the production code, branched off from main and then merged back into both main and develop once the fix is complete.

Branch Naming Conventions:

• Feature branches: feature/your-feature-name
• Hotfix branches: hotfix/your-hotfix-name