Update git flow graphic

[petervanderdoes]

The above graphic is no longer valid for this version and needs to be updated.
The following need to be addressed

• Add bugfix branch. Just add bugfix to the top of the grpah where it says feature.
• Hot fix merges the tag back into develop
• Release branch merges the tag back into develop

Preferably a second graph could be created explaining support branches. To add them to the above graph would make the graph to busy I think.

Any help would be appreciated!

[maldag]

I recreated the drawing and posted it on issue #287.
I'd start a drawing for your cases soon.
EDIT:

• What do you mean with "add bugfix where it says feature"?
• Where's the difference between bugfix and hotfix? For me hotfixing is shown correctly in the diagram and a bugfix is also addressed in the release branch.

[orbitTVO]

@maldag:

I suppose he means the following:

• just like there currently are feature branches defined, bugfix branches should be defined as well
• hotfixes are only meant to be applied to the prodution branch and merged into dev, bugfixes on release branches are only meant to be applied to the release branch and merged into dev. But what about bugs that aren't applicable to any of the aforementioned two? I.e. when someone is just testing dev (like they should) and they find a bug, then an issue should be raised and the bug should be fixed, and because it's nasty to commit directly to dev, a bugfix branch should be created just like a feature branch would. That's how I see it.

@petervanderdoes

You can go ahead and incorporate the proposed changes in the graph, because a lot of people now still use the graph in its current form which is outdated when compared to the actual git flow tooling that is included in the official git tooling.

[Shea690901]

Perhaps include a hotfix during an open release?
Hotfixes are merged into release of open? Alas, we don´t want a bug reintroduced by a new release just because it was fixed (in master and develop) after we started our work on this new release...

[orbitTVO]

Well spotted, @Shea690901.

I agree, when committing a hotfix to master and merging to dev, don't forget to merge into any open release branches as well, because we don't want those to be lagging behind, do we?

[jbinnography]

I like that idea as well.