5 ms·
It's clear that there will be a successor to Git some day, in the sense that Git is a successor to SVN (yes, I know Linus's viewpoints on SVN). But the success
by klodolph 9y ago
It's clear that there will be a successor to Git some day, in the sense that Git is a successor to SVN (yes, I know Linus's viewpoints on SVN). But the successor won't be a "better Git" just like Git isn't a "better SVN".
The driving features of Git's successor will be unrelated to Git UI gripes. If Git's UI gripes were important enough, people would just be using Mercurial (which has it's own quirks). The biggest problems I've personally seen with Git are the same problems you see with other VCS, where two people change the same file, and one commits the changes first. Now you have to merge the changes and sometimes it's a pain in the ass when you just want to submit your changes and go home. A better VCS isn't going to solve that!
I'm still glad that Git delivered me from all the merging problems that SVN had, although I've heard that SVN is a little better these days.
- posterboy 9y agoyou could work in branches and merge after feature freeze, or you could, you know, colaborate and communicate intent before beginning to edit.
- arunc 9y agoPersonally, the problems I have with git are related to the fact that none of my coworkers use git. If I mess up my repo I don't have anyone to look for. The experience with mercurial is exactly the opposite. I never needed to look for "experts" to solve a problem in mercurial. hg help is all I needed. Consistent UX and safe and powerful VCS is all we need.
- pritambaral 9y ago> I never needed to look for "experts" to solve a problem in mercurial. hg help is all I needed. Git has good documentation too. As long as we're doing personal experience, here's mine: I learned git from `git help` too (well, `git --help` and `git <command> --help`), and I never needed to look for a git expert in my team for advanced operations; I did have to be one for others quite a few times , but when it wasn't an immediate, pressing concern I could just point to the appropriate manual.
- 3minus1 9y agoDoes anyone who's downvoting this comment care to explain why?
- masklinn 9y agoI did not downvote the parent comment but I find > Git has good documentation too. hilarious. Git has a sprawling mess of disorganised man pages. I find calling that "good documentation" insulting to people who care about documenting things.
- dboreham 9y agoBecause git dies not have good documentation. Perhaps that's unfair to the documentation in that it does a good job of detailing commands and their options, but is urinating into a hurricane as far as trying to convey any notion of conceptual integrity for a piece of software that has none.
- littlestymaar 9y agoWhat about https://git-scm.com/doc https://git-scm.com/doc ? I wish all the software I use had a documentation half as good as this one.
- masklinn 9y agoI guess low expectations are still expectations?
- Klathmon 9y ago> A better VCS isn't going to solve that! It might! I feel like a "language aware" VCS would be able to help a lot in this area. I know there are 3rd party tools that can do this, but if a VCS came along that natively knew about some languages it could unlock some really cool features. Imagine instead of your VCS storing the text source, it stores the AST! Language aware means it can also integrate tightly with language package managers.
- klodolph 9y agoThat's not really a "better VCS" that's just a better 3-way merge. You can already plug your own 3-way merge into Git and other VCS.
- scotty79 9y agoCan you recommend any language aware 3-way merge tools?
- ygra 9y agoSemantic Merge comes to mind, although it only does an AST merge on the structural level while blocks are still merged traditionally (I guess it's a good tradeoff of complexity, though). It has however proven to be rather slow with large merges (or large files; the source file I tried to merge had ~4 kLOC), in my recent test (was merging a major version of one product into derived ones, with lots of refactoring, so I thought SM could help).
- codegladiator 9y ago> I feel like a "language aware" VCS would be able to help a lot in this area. VCS would have to be much more than "language aware" to even begin to help in this area.
- majewsky 9y agoYes, one would need an AGI for that.
- mikeyjk 9y agoI mean, you could just checkout a new branch and push that, right?
- klodolph 9y agoThen it won't make it into production.
- mikeyjk 9y ago- "submit your changes and go home" - "production" The merge should happen far before it hits production. Maybe I'm taking you too literally or something. Do you have a CI/CD pipeline?
- klodolph 9y agoWorkflow for the team I’m on right now: * Make changes * Run tests * Code review * Submit changes CI pipeline will run larger integration tests, make releases, and deploy to production. We can cherry pick commits to fix bugs at this point. The pipeline will roll out releases to the development environment on a nightly schedule and to production on a weekly using canaries. You can’t submit if your changes don’t merge cleanly. You’ll need to fix the changes and re-run tests (can be slow) at the minimum. If you don’t submit by end of Wednesday you have to wait another week.
- mar77i 9y agoAs the main developer on the project and the resident guru, I ask everyone working on this project to create a branch for their work and just drop me a message - a pull request. Which is a feature incompatible with some git workflows, like the linux kernel's, but finds wide adoption on git productivity tools like gitlab and github.
- cryptonector 9y agoThat successor ought to be Fossil, by all rights. What keeps me from using Fossil is its opinionated UI. Lots of people hate git's UI, but it let's you do all sorts of workflows. You can rebase a lot, or merge a lot, or both. With Fossil you're pretty much stuck with a merge workflow. What makes Fossil superior to all other VCSes is that internally it is a Merkle hash tree organized relationally, with an internal SQL interface. This makes a) development of tools much easier than for any other VCS, b) much easier to write new kinds of queries and make them perform well. Perhaps some other VCS will come along that will do what Fossil does, but with a less opinionated UI. I understand why Fossil is opinionated: it's not meant to be a VCS to take over the world, but instead just a VCS for SQLite3 and related projects. As such its developers don't really care for any functionality that they themselves don't care for, and thus my need for rebasing, and a staging area / index, is as nothing to them. I can't blame them, really, but it would be truly fantastic if we could support rebase workflows with Fossil. Another thing I don't like about Fossil is its approach to repo sync. I like that with git I can push/fetch individual branches/tags, some of them, or all of them. With Fossil you don't get much choice, as it's all public branches or nothing. Power users (and I'm not saying here that Fossil's aren't) need more UI power. To appeal more widely, a VCS as to support more power users.