Skip to content

Git workflow

Jump to bottom
Theresa Hradilak edited this page Nov 29, 2019 · 5 revisions

  • We have one single dev branch for all teams. The dev branch is a development branch where developers can merge there finished features, after team code review. Always squash your merges into this branch and do not delete the feature branch. Always subbranch from this branch and keep your feature branches up to date with this branch.

  • We have one master that contains features accepted by the client.

  • Create a feature branch for each user story/issue. If the user story requires a lot of changes feel free to create subbranches of this feature branch.

  • Each issue assigned to a team needs to be tagged with the team-specific tag.

  • Look at the chart below for the common git workflow.

The git workflow visualized

Clone this wiki locally