Our project management includes a rigorous organization of our Git repository, based on the use of Git-flow and conventional commits, ensuring effective collaboration and optimal traceability of code changes.

The Git-flow strategy provides a clear branching structure that streamlines development and code integration, even in an environment with multiple contributors working simultaneously. With Git-flow, we maintain distinct branches for each development stage. Once a feature is completed, it is merged into the development branch via pull requests, following thorough verification and code review.

Additionally, we implement the conventional commit convention to name commits in a consistent and descriptive way. This standardizes commit message formatting, making them more readable and valuable for project tracking. Each message follows a specific structure, enabling quick understanding of the purpose and context of each change. This approach also facilitates the automatic generation of changelogs by easily identifying added features or bug fixes.

The combination of Git-flow and conventional commit creates a well-organized and readable Git environment where each contributor knows precisely where and how to integrate their changes. This setup promotes better collaboration, minimizes errors, and ensures a rigorous management of our code’s lifecycle. Thanks to this organization, we have encountered only two conflicts since the beginning of our code’s lifecycle, a remarkably low number compared to other projects.