UnifiedFlow: Git Branching Strategy

Pros

  • Every branches fork from a stable state.
  • Prevent side-effects (defect/ad-hoc/config) from merging develop into feature, release and main.
  • Group stable features according to release plan.
  • Easily remove features from release.

Cons

  • Require optional merge branch if using with Pull-Request. PR will merge the target branch on your feature; may cause unknown side-effects and stall you for days to fix it.
  • Multiple merge conflicts in develop and release.

Getting Started

init: main

fork: main -> develop