Our project follows a structured branching model to ensure clarity and maintainability. The branch structure includes:
sprint-1
, sprint-2
, and so on. Each sprint has its dedicated branch.a1-create-task
, representing individual features or tasks.Commits must follow Git best practices. Each commit message should:
For merges, we’ve decided on the following process:
This ensures accountability and avoids merging unchecked code.
To maintain traceability during the sprint, source branches will not be deleted after merging. Branches will remain until the sprint is completed.
GitLab offers a dedicated feature to visualize the repository’s branch structure:
Code > Repository Graph
to view a clear graph of branches and merges.This provides a quick overview of the repo’s state and helps track progress.