Search code examples
gitgit-flowsmartgit

How to properly setup and work with Git Flow


I'm experimenting with Git in a finished (1st phase) project since I would like to have release, feature, hotfix and least but not less tags and I think Git Flow is for this. So I have setup from Smartgit as pic below shown:

enter image description here

Now I started a new release because I end this 1st phase and I client consider this as a "stable" release. So I get this:

enter image description here

But after read here I'm still not sure what the next step would be. I mean how I push or pull my code from master branch to pdone-stable-1? Or I am complete wrong on this and release is just some kind of tag?


Solution

  • The next step in git-flow is

    • Merge release/pdone-stable-1 to master
    • Merge release/pdone-stable-1 to develop

    You would also tag the master merge as a release, but it sounds like you don't want to tag.

    These two actions make your code available in master where it can be deployed and in develop so your team is all in sync.