11 Gitflow Workflow
See the Gitflow page for more information about the workflow itself.
Each developer should work on no more than one feature branch at any time
Create meaningful feature branch names and add your name (or initials) to the branch for easy identification - see branching rules for details
Keep your feature branch synced with develop (as often as necessary/possible)
Close your feature branches as soon as possible. This helps with keeping history more readable and minimises merge conflictsMerge the
pull develop changes:
git pull develop
merge develop into feature branch:
git merge develop
developbranch into your feature branch before finishing it. It is your responsibility to solve any conflicts that your feature introduces. Do it in your local workspace, without breaking anything for the rest of the team.
kb/bestpractices/scc/gitflow-workflow.txt · Last modified: 2023/06/25 11:07 by joerg.hampel