Skip to content

Instantly share code, notes, and snippets.

@Ligalaiz
Last active April 13, 2022 14:53
Show Gist options
  • Save Ligalaiz/61fa2fa984e1a128d87f63d4b56e7efb to your computer and use it in GitHub Desktop.
Save Ligalaiz/61fa2fa984e1a128d87f63d4b56e7efb to your computer and use it in GitHub Desktop.
Conventional Branches

Regular Git Branches

  • master - The master branch tracks released code only. The only commits to master are merges from release branches and hotfix branches.
  • release - containы all of the new stuff that has been finished.
  • develop - is the main development branch. The dev branch’s idea is to make changes in it and restrict the developers from making any changes in the master branch directly. Changes in the dev branch undergo reviews and, after testing, get merged with the master branch.
  • qa OR test - contains all the code for QA testing and automation testing of all changes implemented. Before any change goes to the production environment, it must undergo the QA testing to get a stable codebase.

Temporary Git Branches

  • bug – Bug branches will be created when there is a bug on the live site that should be fixed and merged into the next deployment.
  • hotfix - The bug which needs to be fixed soon. A hotfix branch comes from the need to act immediately upon an undesired state of a live production version.
  • feature - [Feature name] branches. Feature branches are used when developing a new feature or enhancement which has the potential of a development lifespan longer than a single deployment.
  • exp - Experimental Branches

Diagram

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment