Gitflow–a Git Workflow designed around Project Release


 

image

http://nvie.com/posts/a-successful-git-branching-model/

The main branches

  • master
  • develop

Supporting branches

  • Feature-*

    May branch off from: develop
    Must merge back into: develop
    Branch naming convention: anything except master, develop,release-*, or hotfix-*

  • Release-*
    • May branch off from: develop
      Must merge back into: develop and master
      Branch naming convention: release-*

  • Hotfix-*
    • May branch off from: master
      Must merge back into: develop and master
      Branch naming convention: hotfix-*


    Git-branching-model.pdf

    Advertisements

    Leave a Reply

    Fill in your details below or click an icon to log in:

    WordPress.com Logo

    You are commenting using your WordPress.com account. Log Out / Change )

    Twitter picture

    You are commenting using your Twitter account. Log Out / Change )

    Facebook photo

    You are commenting using your Facebook account. Log Out / Change )

    Google+ photo

    You are commenting using your Google+ account. Log Out / Change )

    Connecting to %s