Skip to content

Instantly share code, notes, and snippets.

@xemoe

xemoe/milestone-branching.md

Last active March 25, 2016 00:12
Show Gist options
  • Save xemoe/1c18b04f0011950b271d to your computer and use it in GitHub Desktop.
Save xemoe/1c18b04f0011950b271d to your computer and use it in GitHub Desktop.
Download ZIP
Git milestone branching
Raw
milestone-branching.md

Git milestone branching

Bitbucket major branch

  • 1.x
  • 2.x

Bitbucket minor branch

  • 1.9-dev (latest 1.x develop branch)
  • 1.8-fixes (hotfixes for previous released branch)
  • 2.0-dev (latest 2.x develop branch)

Merge release branch

  • create pull-requests from 1.9-dev to 1.x
  • approved & merged pull-requests "PR - Release version 1.9-dev to 1.x"
  • close branch 1.9-dev and create 1.9-fixes for any hotfixes
  • create next release branch 1.10-dev

Note

  • hot fixes from 1.9-fixes can be create PR directly to 1.x
  • use 1.x for stable release

Version tagging

  • create tagging by format {major}.{minor}.{hotfixes} after merged PR
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment