8 ms·
While I do worry about github, I disagree that the dominance of git is a problem. At some point every industry grows up and standardizes on something, anything,
by lolinder 4y ago
While I do worry about github, I disagree that the dominance of git is a problem. At some point every industry grows up and standardizes on something, anything, because any standard is better than no standard.
Git is far from an ideal solution, but it has emerged as the standard way to manage version control in a software project, and we benefit from there being a standard. Version control is the first barrier to entry in starting on a new project, so having an industry standard for version control benefits everyone: open source projects get more contributors, companies don't have to train new hires on their system, and employees have one fewer barrier blocking them from specific jobs.
Could we have standardized on a better system? Certainly. But launching a competing standard at this point isn't going to make things better, the best case scenario is that it fragments the industry.
- nequo 4y agoCVS used to be the standard before Git. Arguably CVS as the standard was not better than no standard if no standard let you use decentralized version control. But Git is pretty good, so it will take something vastly better to replace it.
- deleted 4y ago[deleted]
- jiggywiggy 4y agoIs it though? Don't know anyone who likes merging or rebasing. Especially big merges. I don't know a solution. But I'm sure someone comes up with a significantly less painful way at some point.
- throwawayadvsec 4y agowell merging two wildly different of files is going to be complicated using any tool, git is not the issue there, there isn't a million ways to handle this
- dmoy 4y agoRight it's a use type thing. If everyone develops from master branch and makes small incremental changes, no problem even if it's git. If everyone develops from their own branches and goes off and does their own thing for a month, but those things are all in totally separate areas of the codebase, not as much of a problem either. If everyone is developing in their own branches for a month, and they're working on overlapping things, and they aren't communicating? Then you get merge problems But it's not really a merge problem, it's a communication problem. (And it's not git-only, you see merge problems even in perforce when people go dark for a long time and come back with a huge change that's got conflicts on 50% of the lines now)
- nirimda 4y agoThere's three ways. One is the git way, which is to let people do whatever and then ask them to handle it afterwards. The next best is used by some other annoying system I used early in my career, which is to require people to check out a file before they can get write permission on it, and only allow one person to have write permission at once, so that there's no real risk of merges. And the worst of all is to just let whoever comes later overwrite whatever was there before.
- jdmichal 4y agoI've used many different version control systems. Git is, by far, the best at merging and avoiding conflicts to start with. I believe it's because it can often work from the basis of a common ancestor commit, so it's able to perform three-way merges instead of two-way merges.
- HWR_14 4y agoWait, avoiding 3-way merges and instead only allowing 2-way merges has been on my list of "advantages of Mercurial that are sadly lost to git" list for a while. Can you expand on what you're saying?
- jdmichal 4y agoThree-way merge might not be the correct term. I mean it as in the three versions being "original", "version-a", and "version-b". Original is the most recent common ancestor of version-a and version-b. So the system can generate clean diffs based on that original version during the merge. I've seen other systems essentially say, "Oops both versions modified this file... Good luck!" It didn't matter that the modifications were to very different parts of the file. I've never seen that in Git. Any merge conflict I've gotten in Git has been a true potential conflict, even if the resolution is straight-forward from my perspective.
- HWR_14 4y agoAh, that's a standard merge but a 3-way diff. Many DVCSs have that (including Mercurial). A 3 way merge would have "original", "version a", "version b", and "version c", where "original" is the common ancestor of a, b and c. Mercurial disallows merges like this, but git supports them. I have no idea why git allows it. But yes, older VCSs ignored the "original" concept, which meant diff tools could just pop up "a" and "b". Which is just a way worse idea than including the original as well.
- prettyStandard 4y agoI love rebasing. As for dealing with merge conflicts, it's called - keep up to date with the branch your tracking - merge frequently - get on a call when you do have merge conflicts - avoid having multiple people working in the same files simultaneously if possible The problem with merge conflicts is you have two people changing the same lines of code at the same time. So I would imagine if you wanted to improve the situation you would need an AI powered version control system that understood the intent of the previous developers. But that's not going to fix bad habits.
- yjftsjthsd-h 4y ago> As for dealing with merge conflicts, it's called That sounds like a lot of words for "try really hard to avoid having merge conflicts, because they suck to deal with"
- jcranmer 4y agoMercurial's phases and changeset evolution make specifically rebasing far less painful. git rebase -i is downright antediluvian in comparison.
- prepend 4y agoMerges are hard and I’ve never seen a system that removes the difficulty. I actually think git is the best because it’s easier to branch and update than many others (a pull takes a second to refresh vs quite a while for large repos with svn). I was using ClearCase for a few years and they had a really nice visual merge tool, but the complexity of the merge was great because they were so infrequent. I made a mistake and let someone find out I could merge and ended up getting sucked into these quarterly multi-day merge sessions that made me feel like a guild navigator stressing about breaking one of thousands of changes from 50 people over 90 days.
- adastra22 4y agoThe solution is darcs’ patch-theory model of development, currently being pushed forward by pijul.
- gavinhoward 4y agoI am making a VCS to compete against Git and Pijul. The patch-centric model of Darcs and Pijul is insufficient. You also need to remember where patches came from. If rewriting a patch does not keep its provenance, you're also in for a world of hurt. But even that is not sufficient. You need to have more context than even the patch-centric model gives you.
- adastra22 4y agoPlease share when it is ready!
- gavinhoward 4y agoAbsolutely! I am planning to make a "Show HN" my official announcement, but only after it is self-hosting and has enough features to replace my Gitea instance.
- gspencley 4y agoCVS, subversion and mercurial are all VCS tools that I remember using throughout the years. Didn't Microsoft even have its own for a while? I swear I remember Visual C++ integration features back in the 90s / early 00s but I can't remember what it was called.
- HappyJoy 4y agoTeam Foundation Version Control Edit: And Visual Source Safe
- Sander_Marechal 4y agoYes, MS Visual Sourcesafe (VSS). It was... not very good
- grimjack00 4y agoIt was, however, a step up from the shared network drive with a bunch of zip files.
- politician 4y agoDebatable. You would come into work in the morning and find that VSS had been corrupted and needed to be restored to an earlier backup. This was a common occurrence.
- prepend 4y agoThat the lovely common occurrence of someone checking out 1000 files and going on vacation. I preferred just a normal folder, rsync (or some nt utils equivalent) and backups.
- wheelie_boy 4y agothey also had an internal source control system that they never released, which was a fork of perforce that they had purchased the rights to use and modify. Not sure if that's still in use in any projects.
- lolinder 4y agoMy understanding is that before git a substantial portion of the industry used the "one big shared drive and shouting across the room to lock files" version control system. There was also SVN that was pretty popular pre-git. I don't believe any version control system achieved as deep industry penetration as git has.
- andreabergia 4y agoIn my experience, SVN was _everywhere_ 10 years ago or so.
- pcthrowaway 4y agoI used SVN once for my capstone project 11 years ago, graduated that same year, and literally haven't encountered it a single time in my career since then. It definitely wasn't everywhere 10 years ago (but github was). Do you mean 15-20? Regardless, having completed a CS degree during the period SVN was supposedly everywhere and only encountered it once because someone in my capstone team knew how to use it, I'm inclined to think it didn't permeate everything the way git does now. If I could complete a bachelors in CS without encountering it in any of my courses, I think it's safe to say git is much more ingrained in the field now (pretty much every syllabus I come across online for CS courses from the last 5 years has had some github links)
- Klonoar 4y agoSVNs heyday is closer to 15 years ago at this point.
- liveoneggs 4y agosubversion was just as dominant as git is now. Not using version control at all is probably just as common as it was previously.
- morelisp 4y agoSVN took over the hobbyist area rapidly due to its workflow/UI similarity to CVS, but P4 held fast professionally until at least 2015, as well as Source Safe if you were an MS shop. (And conservative places never switched off CVS at all.)
- deleted 4y ago[deleted]
- JohnFen 4y ago> But Git is pretty good, so it will take something vastly better to replace it. Git is fine, but honestly, my favorite of the several I've used over the years is still svn.
- forrestthewoods 4y ago> But Git is pretty good, so it will take something vastly better to replace it. Correction: Git is super mediocre, but sufficiently wide spread it will take something vastly better to replace it. Don’t confuse inertia with goodness.
- MetaWhirledPeas 4y agoGit is solving a very complicated problem with a command line tool. Don't confuse a complicated problem with a mediocre application.
- forrestthewoods 4y agoGit is a mediocre CLI, imho, ymmv. GitHub I don’t have a strong opinion on.
- nequo 4y agoBut Git is not only the porcelain, it’s also the plumbing. Do you think that the plumbing is super mediocre too?
- forrestthewoods 4y agoI don’t know what that analogy is supposed to mean. I don’t think analogies are necessary or appropriate here.
- nequo 4y agoThis is the terminology that Git uses. Porcelain is the UI, whether it’s the basic CLI, Magit, Fugitive, or anything else. Plumbing is Git under the UI. Are you saying that the CLI is bad, or that Git’s underlying concepts and data model are bad?
- forrestthewoods 4y ago
- gspencley 4y agoGit is also FOSS and is not owned by Microsoft / Github. Using git doesn't really "give" Github anything other than a bit of convenience and brand linkage. If the industry wanted to adopt a git replacement I suppose that Github's use of git could be a hinderance, but honestly the coupling is pretty loose. Also, I worked in consulting for a few years and while Github was common, so was Azure devops (ironically also Microsoft, though) and one project used BitKeeper. Github might be dominant, but is very far from a "monopoly" in my opinion (I don't know if anyone used that word but if that's not the concern then what's the big deal?)
- 666satanhimself 4y ago[dead]
- JohnFen 4y agoYes, my experience is that Github isn't actually universal. I've yet to work for a company that uses it, personally. My only interaction with Github is in the hobbyist realm when I want code from an OSS project that is hosted there.
- bguebert 4y agoThis has been my experience too. I think of Github as more like a social media platform that incorporates git as a convenient feature. Large corps use it as a marketing/PR forum and regular people use it to connect to other people interested in programming.
- jfreax 4y agoBut what software are large corps use then? I work at a fairly large coorp (>650000 employees) and they are indeed using Github Enterprise (and some other solutions like Bitbucket data center). I'm would be quite surprised if they really only use software like Github for public things.
- JohnFen 4y ago
- rcme 4y agoGit is great. It’s FOSS, but that doesn’t mean it’s immune to a hostile corporate takeover. Take email for example. It’s an open standard, yet it’s usage is dominated by large corporate players.
- MattGaiser 4y agoThe alternative is a spam and scam mess that would kill email.
- pmlnr 4y agoBS. There are and were (I lament dspam) excellent spam filters, plus if you enforce greylisting barely any spam gets through.
- elric 4y agoIndeed. And if we hit spammers with half the hammer that pirates have been hit with, it'd be a much smaller problem ... but for some reason, spam seems to be immune to legal action.
- BowBun 4y agoSpam inflates numbers and ends up benefiting nearly everyone except the end user in the short-term: - Platforms benefit from larger activity volume, thus increasing their numbers and $$$ - FTC and other regulatory bodies get to take low-effort actions and tout the massive effects, ignoring the fact that they're slapping the ocean with a stick. - All the systems in between are charging each other for artificial traffic, resulting in a convenient ponzi-like situation. I wouldn't be surprised if large chunks of vendor (SendgridTwilio, cloud providers, etc.) revenues are from illegitimate business.
- wpm 4y agoI imagine a similar thing is happening in the phone space too. Scam calls are 99% of the calls I get on my cell phone now, and probably close to that for "revenue from calls" that the providers are raking in. If I could spin up my own cell network like I could an email server and a domain, you bet that the big cell/telecom players would "blacklist" my domain for "spam" the moment they caught whiff and instantly make it almost useless, same as Gmail does.
- nonbirithm 4y agoI agree with this. I was working on a project that was only available with Mercurial and I spent three days just trying to figure out how to not irreversibly corrupt my repo for a one-line change. I never figured it out and gave up since it wasn't super important. I was happy when Atlassian finally sunset Mercurial, forcing those repositories to move to git. I'd rather all major source code hubs standardize on git since it's harder to contribute needing to learn different incompatible workflows.
- pabs3 4y agoI recommend using git-remote-hg when dealing with Mercurial repos. Or git-cinnabar for very large ones like Mozilla's.
- MattJ100 4y agoCorrupting your repo with a one-line change? Is there more to this story? A bug report, for example? It's not my experience of Mercurial at all.
- MetaWhirledPeas 4y agoEven if Mercurial is fine, Git is really good and is the standard in most cases. It's not worth confusing new hires with an alternative repo system when Git is this good, this common, and also happens to be FOSS.
- jcrawfordor 4y agoThe usual argument for Mercurial, though, is that it's easier to use and more resistant to getting the local repo into odd states than Git. That tends to make Mercurial a better option for people without significant Git background, and definitely makes bad user experiences of that sort with Mercurial interesting. I guess what I'm getting at is that Mercurial supporters tend to view it as distinctly better than Git, so sticking to Git just because of its widespread usage does feel like a sort of defeat... One could say similar about Fossil, a much more ambitious project that has faltered probably mostly due to Git claiming all the mind share.
- mihaic 4y agoI remember using Perforce and Accurev about 10 years ago, and they were miles better than Git in terms of abstraction and feature set. I often miss being able to work on multiple branches with partially uncommitted local work for instance. I do want the open-source world to improve and if we merely build on top of git's abstraction, how can we have any progress then?
- haradion 4y agoFor the specific use case you're describing, I've found `git worktree` to be very useful. Overall, at least when it comes to features, I've actually had the opposite experience. That said, I'm one of those people such that you can pry `git rebase` out of my cold, dead hands, so it's that feature specifically that I really miss when I have to work with Perforce.
- deleted 4y ago[deleted]
- ubertaco 4y agoSalesforce uses Perforce internally, and it's a _massive_ source of problems for their giant monorepo precisely because there's no lightweight branching, so among the 1500+ developers working on the same codebase, _someone_'s always checking broken crap into the same branch all the time and causing huge headaches for everyone else. When I left, they were investing a ton of time and developer hours into trying to duct-tape git onto their workflow by having smaller groups of developers share cached copies of their huge Perforce repo, and shunting the inevitable merge conflicts onto someone else and hoping for the best. I spent a considerable amount of time training folks at my acquisition how to work in this environment, and roughly 70% of that time was "yes, Perforce _is_ weird and confusing and annoying, and yes, it _would_ be better if we had lightweight branches, but instead we're stuck in the version-control stone age of Perforce, so here's the complex process you can try to go through to un-break your own local codebase temporarily until someone else has fixed the broken crap they checked in."
- eesmith 4y ago> At some point every industry grows up and standardizes on something, anything, because any standard is better than no standard. What's the standard programming language? The standard editor? The standard database? > launching a competing standard at this point isn't going to make things better, the best case scenario is that it fragments the industry. People keep coming out with new programming languages, new editors, and new databases.
- Klonoar 4y agoThe standard editor, if one had to give an answer, is probably VSCode at this point. Likewise the standard DB may be Postgres. Others exist but they’re certainly not the recommended defaults you find people giving out nowadays.
- eesmith 4y agoBut no standard programming language, yes? VSCode was not the standard seven years ago. ("In the 2016 Developers Survey of Stack Overflow, Visual Studio Code ranked No. 13 among the top popular development tools, with only 7% of the 47,000 respondents using it" says Wikipedia). If lolinder's thesis is true, then that means it can take over 50 years before the industry decides on a standard. Which seems rather a long time for that statement to be meaningful. Because within 10 years maybe it will all change again. FWIW, I've mostly used SQLite as my DB.
- Klonoar 4y agoWhat on earth does 7 years ago have to do with 2023? Look at the 2022 survey, not one from 2016: https://survey.stackoverflow.co/2022/#most-popular-technologies-database https://survey.stackoverflow.co/2022/#most-popular-technolog... VSCode is overwhelming at a staggering 74%. ;P
- eesmith 4y agoGit is certainly by far the de facto standard VCS. But I don't think lolinder's reasoning for why that is so has strong support, as it doesn't explain why other areas haven't already achieved the same standardization. lolinder wrote "At some point every industry grows up and standardizes on something, anything, because any standard is better than no standard." Either there was a standard editor before VSCode or there was not. If there was a standard editor before VSCode, then it's clear that standards can change, which challenges lolinder's proposal that "launching a competing standard at this point isn't going to make things better". The VSCode developers likely thought it would make things better. If it was no standard editor, then it took about 50 years for the industry to decide on one (dating from the late 1960s to 2016, when VSCode was definitely not the standard). Leading to my observation that the "at some point" can take decades, and implies the urge to have a standard is not all that strong. My memories of the 1990s was the CVS was the de facto standard, like how VSCode is now for text editors. Yet people fragmented the industry with SVN, BZR, Git, BitKeeper, Git, and more - because because they thought they could make things better. And at least one of them was right. I'm therefore not so confident about rejecting launching an alternative to git. My limited understanding of Fossil, for example, tells me there are better approaches than git. (Then again, I'm a Mercurial user, so I already have my own preferences. ;)
- emrah 4y ago> Git is far from an ideal solution, but it has emerged as the standard way Humans are such a weird species. The juxtaposition of the two arguments ("not ideal" and "the standard") is crazy to me. If it's not ideal, let's move away from it, not standardized on it. Is that too much to expect? :)
- jiveturkey 4y agoEnglish units (feet, pounds) are not ideal, and we have a better solution, yet ...
- jiveturkey 4y ago> I disagree that the dominance of git is a problem. ok but that's not the argument of the article, so you aren't disagreeing with TFA. Maybe you're disagreeing with another top level comment. TFA is arguing that the dominance of git hub is or is becoming a problem.
- lolinder 4y agoAnd there's an entire section that argues that git becoming entrenched as the standard is part of the problem with GitHub. That's what I was replying to. > git itself, while not owned by GitHub, is even more popular. This is largely because of GitHub’s popularity and in spite of git’s poor UX. It would be nice to move beyond git one day and have a better experience for managing complex codebases, and not on GitHub’s timeline. > ... > I want to underscore this because I think it’s important: git and GitHub’s symbiosis are holding us back as an industry. > ... > Other version control software exists that doesn’t need a separate company to make the code accessible from the web or makes dealing with conflicts easier. We as an industry cannot benefit from these alternatives if we continue to use GitHub this heavily.
- jiveturkey 4y agothanks. i somehow glossed over those bits. i guess because i agree that the dominance of github is a disaster, so i was focused on the parts of TFA that i agree with. like you, and i guess contrary to the article (again, like you), i think git itself as lingua franca is fine and maybe even great. certainly it has warts, some of them substantial, but what doesn't. we've come a long way since CVS and (shudder) SCCS.
- pmeunier 4y agoThis is only true for alternatives to Git that are roughly equivalent in terms of complexity and time to learn. This wouldn't hold for an actual improvement (in productivity and training time), just like Rust, Zig or even Go are oven C++ and Java (the industry standards).