How to contribute: a Gitflow‐inspired struture - jejellyroll-fr/fpdb-3 GitHub Wiki

a Gitflow-inspired struture, for better collaboration

Main branch:

  • Name: main
  • Contains only stable, production-ready code
  • Used for releases

Development branch:

  • Name: development
  • Main branch for ongoing development
  • All other branches derive from it and are merged with it

Feature branches:

  • name: feature/xxxx
  • Created from the development branch
  • Merged into development once completed

Hotfix branches:

  • name: hotfix/xxxx
  • Created from main to quickly fix critical production bugs
  • Merged into main and development

Bugfix branches:

  • name: bugfix/xxxx
  • Created from development to fix non-critical bugs
  • Merged into development

Release branches:

  • name: release/xxxx
  • Created from development when a version is ready for release
  • Enables final tests and adjustments to be made before merging into main