Skip to main content

STD - Git branch model

Objective

Describe the standards to follow to work correctly with Git branches.

Content

  • STRIXDEV uses Gitflow as its branching model, which requires two main branches: "main" and "develop". The "main" branch contains the stable code that will be released to production, while the "develop" branch contains the code that is currently being worked on. In addition to the parent branches, child branches are also used to create new functionalities, fix bugs or enhance previous code.

  • To name a Git branch, you need to follow the branch naming standards.

  • To perform any merge into the "develop" or "main" branch, you must create a pull request and get it approved by another partner of the development team through Git.

  • Before creating or merging a branch, you must verify that you are working on the most up-to-date versions of them by means of a git pull.

  • Not a single pull request should stay longer than 7 days, if this happens it must be solved in a daily meeting by merging the changes without revision.

Versions

VersionDescriptionResponsiblesDate
1.0Standard creationErick Eduardo Avalos Riveros14/04/2023
1.1Fix some issues and add informationEmmanuel Antonio Ramirez Herrera17/04/2023
1.2Add pull request expirationEmmanuel Antonio Ramirez Herrera09/01/2024