User Tools

Site Tools


kb:bestpractices:scc:gitflow-workflow

11 Gitflow Workflow

See the Gitflow page for more information about the workflow itself.

  1. Create meaningful feature branch names and add your name (or initials) to the branch for easy identification - see branching rules for details
  2. Each developer should work on no more than one feature branch at any time
  3. Keep your feature branch synced with develop (as often as possible) to avoid drifting from main code (git pull develop)
    1. i.e. merge develop back into your feature branch
  4. Close your feature branches as soon as the work is finished, not after days when some details are already forgotten. This helps to keep history more readable.
  5. Merge the develop branch into your feature branch before finishing it. That way, you can solve any conflicts in your local workspace without breaking anything for the rest of the team.
kb/bestpractices/scc/gitflow-workflow.txt · Last modified: 2022/10/05 21:10 by joerg.hampel