11 Gitflow Workflow

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)

• pull develop changes: git pull develop
• merge develop into feature branch: git merge develop

Close your feature branches as soon as possible. This helps with keeping history more readable and minimises merge conflicts

Merge the develop branch 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.