this post was submitted on 21 Aug 2023
424 points (94.0% liked)
PC Master Race
14924 readers
1 users here now
A community for PC Master Race.
Rules:
- No bigotry: Including racism, sexism, homophobia, transphobia, or xenophobia. Code of Conduct.
- Be respectful. Everyone should feel welcome here.
- No NSFW content.
- No Ads / Spamming.
- Be thoughtful and helpful: even with ‘stupid’ questions. The world won’t be made better or worse by snarky comments schooling naive newcomers on Lemmy.
Notes:
- PCMR Community Name - Our Response and the Survey
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
The concept of a master branch reaches back to CVS (that's Concurrent Version System, not a pharmacy), and Subversion. Makes sense it wouldn't make sense to you. Frankly it doesn't make sense to
git
at all, but that's a much larger discussion.The concept of a "master copy" has been around and in widespread use for around a century. It has nothing to do with either software nor social (in)justice. It's just the thing you photocopy so you don't end up making photocopies of photocopies. IMO It should make sense to anyone who, you know, has seen and used paper within their lifespan.
Some terminology, like "master and slave" for IO between devices, did always used to make me really uncomfortable whenever I heard it. But the branch name for software was probably fine.
Yeah, LP records have master copy and those have been around for some time (before going away and coming back again)
More than a century
Ever since Hammurabi
It's been a long time since I've used SVN by aren't things like branching more difficult? I guess for personal it doesn't matter.
Not really. If memory serves it's just
svn checkout branch_name
I have never used Git professionally but I'll tell you the three biggest pain points when working with SVN that I know Git has proper solutions.
No local commits. On the latest SVN versions there is the concept of "shelves" which just basically puts your changes in a separate folder... as of last I checked it was still in Beta but it works decently.
Common code is a pain in SVN. The only way you can do this is using the externals property which has annoyances that seem to be handled better by Git Subtrees.
Commit squashing doesn't exist in SVN. Not a problem for me personally but I've worked with some people that make me really wish I could squash their commits.
Git is really inefficient for large binary files because of the decentralization. SVN for media and Git for text-based files makes sense. Otherwise— I only used SVN briefly, and then fortunately only for media— But yeah, Git is probably better and more useful overall.
I wouldn't want to go back to svn. I've gotten very used to git's ability to carve up changes, etc.