git flow memo introduction

Good practices

  • Never push directly on the master branch

  • Never push directly on the current development branch

  • Always create your own branch when working on a feature

  • Rebase your branch before merge it

  • Always use merge request (or pull request for github) to ask to merge your branch on the current development (or feature) branch

  • Be sure to understand what you do

Branches model and git architecture

See here