2 ms·
I've been running with this for about a year. No one has mentioned self discipline as an issue. Its strongly tempting to "change one little thing" outside the
by VLM 13y ago
I've been running with this for about a year. No one has mentioned self discipline as an issue.
Its strongly tempting to "change one little thing" outside the model. Yes yes I know "git flow hotfix" blah blah blah its only a dozen command lines or whatever. But sometimes its so tempting just to checkout master, fix one character, and push it.
The problem isn't so much dumb little typo-fixes that should have been caught in "release" testing, if not feature or develop, or keeping "real" huge changes in the git-flow, but those annoying border cases where both could be argued to be wrong or right.
One solution is to go hard core fundamentalist and demand everything go with the git-flow never outside the process, although that will "waste" some time.
- geocar 13y ago> although that will "waste" some time. Not so much, although it wastes someone's time. Someone has to be the release manager, and git-flow gives them only one tool: To reject the release by pushing back. If they eliminate the develop branch and merge the features directly into the release branch (whenever they attempt to perform a release) then if something goes wrong, they can simply drop one of the features and re-build their branch.
- VLM 13y agoThat sounds like an overly exciting way to avoid using the hotfix branch in git-flow. If I'm reading you correctly you're saying something like implement hotfix branches but call them feature branches and just kinda skip develop, or rephrased type in the word "feature" on the command line but use it like a hotfix is supposed to be used. I think that sounds exciting and strongly encourage my competitors to try it. (no, seriously though, don't do it...)