The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.
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 v220.127.116.11.
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.
"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.
And wife's laptop died... As it is an old HP we decided to get a new, but meanwhile (3-5 days) she has to work, so I put her HD in my PC and powered it up...
No keyboard/mouse and not network (internet)...
After messing with the BIOS (!) to enable USB legacy emulation and ask to fake some basic LAN instead of the 'gigabyte' labeled I have, Windows was finally loading...
After an other 30 minutes of installing drivers from the original CD (of the motherboard), it left only with the memory controller unidentified, but still works...
Not exactly... It is so sloooooooooooooooooooooooooow, you can die! It is also pops-up a message about too new CPU and how they sorry that they can not install security updates (the OS totally up to date!), every 15 minutes or so...
I think I will try to convince wife to move to Fedora or Ubuntu...
"The greatest enemy of knowledge is not ignorance, it is the illusion of knowledge". Stephen Hawking, 1942- 2018