|
My biggest issue with git flow is the 'Release branches must merge back into master and develop'.
When you need to support previous (and long running) releases, it makes zero sense.
Git flow, I think, works only if you have the kind of software that can always be upgraded to the latest version, no matter what, and you don't do any bug fixing or small functional additions to prior releases. So you have only one 'master'.
Think of MySQL bugfixing 7.x.y (release branch) and then merging that bugfix into the latest development (8.0.x). That bugfix might be in code that even doesn't exist anymore.
|
|
|
|
|
We struggled with that in the past when we were using SVN.
For supporting bugfixes on older versions you could make separate branches in GIT for each release (if your CI system supports that kind of thing). It seems Bamboo and TeamCity do support it
I think I would prefer to only create the separate branch when the need for a bugfix arises, otherwise it makes things a bit messy.
|
|
|
|
|
|
|
My company uses gitflow for several different projects (several different git repos) with teams of varying sizes, anywhere from 3 - 20 developers (so, yes, relatively small). Gitflow works well for us and, for the most part, I fail to see any significant differences between gitflow and the others mentioned here. I'm familiar with the "successful Git branching model" article but I prefer Atlassian Gitflow Workflow. In my opinion, it's simpler.
Regarding the complaints about gitflow, either we've subconsciously tailored gitflow to meet our needs or two articles linked above are wrong about gitflow (or I am wrong about gitflow). Two key claims made in those articles are 100% inaccurate (there are probably more, I only skimmed):
1. "Another big difference from git-flow is that we push to named branches on the server constantly." -- yeah, we do that too with gitflow and, in fact, Atlassian's page says "Each new feature should reside in its own branch, which can be pushed to the central repository for backup/collaboration".
2. "The other gap that I’ve found with GitFlow is that it doesn’t provide support for old release versions." -- Huh? I don't think so (e.g. git checkout v1.2.3 where v1.2.3 is a tag for release 1.2.3 and you are currently on release 10.11.12) and then patch your code and release v1.2.3.1 .
Other complaints about gitflow are more about "problems" with dev-process or company-culture:
1. "Long-running branches" is a relative term. I agree "long-running branches" are a very bad thing but branches that last a week or two are fairly common on our smaller teams but I suspect larger teams might reasonably consider these to be "long-running branches".
2. We do code reviews (not just merge requests) so would rather not tolerate the overhead and interruption involved in some strange policy that "all team members commit to trunk at least once every 24 hours".
3. The projects I'm working will never scale to 25000 developers on a monorepo so a flow technique that scales to that level is not a selling point for me.
Bottom line is that all of these flow techniques work and all of them can be customized to fit your needs. What's more important is that you choose *some* flow technique, then decide on the "official" documentation, and then point all current and future devs to that documentation.
|
|
|
|
|
Thanks, that's a nice explanation on the Atlassian site, but I think we will be holding on to "Trunk based development" for the moment.
|
|
|
|
|
Dilbert OTD: Ergonomics[^]
Sent from my Amstrad PC 1640
Never throw anything away, Griff
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
|
The risks of office furniture.
FTFY.
|
|
|
|
|
To misquote Tolkien:
"There are older and fouler things than Orcs in the deep places of the world office."
Edit: And now don't tell me that these things are CodeWraiths!
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
You shall not pass!
Freedom is the freedom to say that two plus two make four. If that is granted, all else follows.
-- 6079 Smith W.
|
|
|
|
|
You get a shirt[^], and now stand aside! No man can stand in the way of a CodeWraith!
(Your turn! )
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
Psych, I am no man.
|
|
|
|
|
*Sigh*
Plan B, then...
"Come not between the CodeWraith and his prey! Or he will not slay thee in thy turn. He will bear thee away to the houses of lamentation, where code review is held, beyond all darkness, where thy flesh shall be devoured, and thy shriveled mind be left naked to the Lidless Eye debugger."
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
Yeah, and do not forget Continuous Desintegration
|
|
|
|
|
How about the infinite death sentence[^]? (I hope you can read it)
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
No problem, as my German is not that good I just push the translate button on the top right of the page
|
|
|
|
|
|
That you don't lose weight by eating salads and walking everywhere...
Sent from my Amstrad PC 1640
Never throw anything away, Griff
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Boom!
|
|
|
|
|
Why the joke icon?
|
|
|
|
|
Jörgen Andersson wrote: Why the joke icon?
Precaution against potential backlash.
|
|
|
|
|
Because if you walk a lot and eat salad you actually lose weight
GCS d-- s-/++ a- C++++ U+++ P- L+@ E-- W++ N+ o+ K- w+++ O? M-- V? PS+ PE- Y+ PGP t+ 5? X R+++ tv-- b+(+++) DI+++ D++ G e++ h--- ++>+++ y+++* Weapons extension: ma- k++ F+2 X
|
|
|
|
|
Dear Vegans
I killed this cow because it was eating your food.
Your welcome!
Socialism is the Axe Body Spray of political ideologies: It never does what it claims to do, but people too young to know better keep buying it anyway. (Glenn Reynolds)
|
|
|
|
|
Also that "Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo" is a valid sentence.
|
|
|
|