I've read the canonical article about GitFlow by Vincent Driessen, and there are 2 things I'm not sure about:
- In the big diagram in the beginning of the article:
In the line of the develop branch, we see some commits that seemed to be just committed directly to the develop branch (not merged from any feature branch). Is that possible according to the strict rules of GitFlow, or is it just inaccuracy in the diagram?
- In the section about "Hotfix" branches, it says that once ready, the hotfix needs to be merged back into develop. But what if the bug was found a fair amount of time and releases after that bugged release was released? Say we're already in version 5.1 and a bug was discovered in 2.5, in which case it may be completely irrelevant to merge those changes to develop.