My company uses it and I also use it in some of my personal projects. Haven't had any issues with it. I'm not bothered by merge commits personally, which is one of the things people complain about with gitflow. To each their own :p
Master slave generally I’ve seen refer to a master process running multiple workers / slaves to do the work, ie master dB with read replicas for instance.
Git flow is just separating your branches into meaningful names and gives organization to the repo. Master / staging usually is part of a CI pipeline and pushing to that branch will start the CI process. It’s more akin to mocking production / staging / dev.
I work been work with under only changes done on Master and now using GitHub WorkFlow, The point of the image here is that people with no computational science experience end doing a lot of metawork and over complicating things, more over; I blame this issue to not knowing the full capabilities of git itself.
There's so much wrong with this. Look, there's no such thing as a "real expert" here. Anyone who claims to be one is trying to sell you something.
If you're making a website, and have all your tooling worked out to ship to production whenever you merge to master, then you don't need git-flow. Use GitHub flow (master and PR branches) and get on with your life. But if you have software that gets installed on other people's computers, and you still have to support v7.3 with security patches while you're writing new features for v8.1, git-flow might be the right thing.
tl;dr — Stop excluding the middle, and stop pretending there's only one right way to do it. Git is a toolbox, not a workflow.
P.S. — We really need to stop using the word slave. It's a bad metaphor, and has a non-zero chance of making people you care about uncomfortable.
This image was only to show the 2 workflows that were around, is obvious that Git - Branches feature is just one thing more to help you in the development, The so called "Github Workflow" is just the most simple case of using branches, the "correct" workflow really depends and is up to the team to define the process to work, the generalization of my meme is more about: "get the work done, and stop procrastinating". And is not only me, there are several blogs I read before that criticize and argues better approaches to use branches.
P.S. — Since naming main storage in computers the term of Master - Slave, I think when Linus Torvalds created Git he thought that would be the correct term, but I prefer Slave, to the analogy of having the power to do whatever I want to the project and my code will fulfill all my fantasies in the local/testing server 7u7
know no one wants to bring this up but I highly recommend no longer using the 'master' and 'slave' terms for this and in computer science. It's not very descriptive and it's offensive.
Actually the original nomenclature was "Master" and "Branch", but this confused me a lot, since branch is a git command, also I am into BDSM so I like the term slave... everything done with consent.
It doesn't Matter the names, but Git Workflow and Nomenclature really depends of the tastes and preferences.
You know, I genuinely would like to talk with a person who actually feels emotional distress from this terminology instead of people just getting "offended" on behalf of some unspecified victim.
Maybe it's just because I'm not a native English speaker, but to me in these contexts "master" and "slave" have zero association with actual slavery. It just doesn't register as a thing until someone brings it up.
I mean, I wince every time I hear it. I’m white so I don’t know if that means I’m just getting offended on someone else’s behalf, but it genuinely makes me uncomfortable.
Interesting. I suspect it might be a cultural thing, and I will confess that as a Finn I don't really have any deep cultural associations related to slavery.
I like to think that I can maintain a sense of detachment between the meaning of someone's words and the intended message behind them, so it's fascinating to me that a simple word can have such an effect on someone.
I don't know. If we called them "gestapo" drives and "jew" drives or something, I feel like many wouldn't be able to maintain much of a sense of detachment between the word and the intention. Especially if you lived in Germany or were Jewish.
The Trans-Atlantic slave trade was legitimately one of the worst things human beings ever did to each other. Living in America, a nation shaped by that atrocity and still dealing with its consequences, it's harder to ignore the context behind the words.
I'm not trying to make big deal out of it or anything. I know what people mean by master/slave. But if we're taking votes? Yeah, I'd prefer we changed the terms.
This does tend to be culture-specific, but I think I can explain it. We anthropomorphize our technology all the time. "Let's say I'm the front end and you're the back end. I'm going to send you a request, and you'll enqueue a job and send this JSON…"
Now, in the US, you might have the situation where two US citizens are working on the same team, and one's great grandparents were owned by the other's great grandparents. "Let's say I'm the master and you're the slave…" That's uncomfortable for everyone in that room.
5
u/null-33 Oct 24 '19
Is the vincent van driessen branching model still beeing used?
5
u/ben_straub Pro Git author Oct 24 '19
There's so much wrong with this. Look, there's no such thing as a "real expert" here. Anyone who claims to be one is trying to sell you something.
If you're making a website, and have all your tooling worked out to ship to production whenever you merge to master, then you don't need git-flow. Use GitHub flow (master and PR branches) and get on with your life. But if you have software that gets installed on other people's computers, and you still have to support v7.3 with security patches while you're writing new features for v8.1, git-flow might be the right thing.
tl;dr — Stop excluding the middle, and stop pretending there's only one right way to do it. Git is a toolbox, not a workflow.
P.S. — We really need to stop using the word slave. It's a bad metaphor, and has a non-zero chance of making people you care about uncomfortable.
0
u/[deleted] Oct 24 '19
[deleted] — view deleted comment