Skip to content

Latest commit

 

History

History
39 lines (29 loc) · 1.52 KB

gitflow.md

File metadata and controls

39 lines (29 loc) · 1.52 KB
Raw

<-- Home

Gitflow Branch Management

When an issue moves from "Todo" to "In Progress" on the Kanban project board, it is important to use a Git branching strategy that prevents merge conflicts and allows for hotfixes and bugs to be deployed independent of feature development work.

For these reasons the DE (Digital Engagement) team has adopted Gitflow for moving development work through "In Progress" to "Done".

Default Branches

Prefix Function
main The branch that is currently deployed. Only merge fromrelease and bug branches.
dev The branch that all development work goes through.

Development Branch names

Prefix Function
feature/* Most work tied to an issue in GitHub.
release/* Created off of dev in preparation for deployment.
bug/* Usually called hotfix this branch is created only from main.

Process

The overall flow of Gitflow (taken from Atlassian docs):

  1. A dev branch is created from main.
  2. A release branch is created from dev.
  3. feature/ branches are created from develop when an issue is assigned and marked "In Progress".
  4. When a feature/ is complete it is merged into the dev branch.
  5. When the release branch is done it is merged into dev and main.
  6. If an issue in main is detected a bug/ branch is created from main.
  7. Once the bug/ is fixed it is merged to both dev and main.