▲ | jordanb 4 days ago | |||||||||||||||||||||||||
I feel like git set back mainstream acceptance of copy-and-merge workflows possibly forever. The merge workflow is not inherently complicated or convoluted. It's just that git is. When dvcses came out there were three contendors: darcs, mercurial and git. I evaluated all three and found darcs was the most intuitive but it was very slow. Git was a confused mess, and hg was a great compromise between fast and having a simple and intuitive merge model. I became a big hg advocate but I eventually lost that battle and had to become a git expert. I spent a few years being the guy who could untangle the mess when a junior messed up a rebase merge then did a push --force to upstream. Now I think I'm too git-brained to think about the problem with a clear head anymore, but I think it's a failure mostly attributable to git that dvcs has never found any uptake outside of software development and the fact that we as developers see dvcs as a "solved problem" outside more tooling around git is a failure of imagination. | ||||||||||||||||||||||||||
▲ | robenkleene 4 days ago | parent | next [-] | |||||||||||||||||||||||||
> The merge workflow is not inherently complicated or convoluted. It's just that git is. What makes merging in git complicated? And what's better about darcs and mercurial? (PS Not disagreeing just curious, I've worked in Mercurial and git and personally I've never noticed a difference, but that doesn't mean there isn't one.) | ||||||||||||||||||||||||||
| ||||||||||||||||||||||||||
▲ | TylerE 4 days ago | parent | prev | next [-] | |||||||||||||||||||||||||
That git won over hg is a true tragedy. The hg ux/ui is so much better. | ||||||||||||||||||||||||||
▲ | marginalia_nu 4 days ago | parent | prev | next [-] | |||||||||||||||||||||||||
Yeah I mostly agree with this. I'm mostly talking about git the model, rather than git the tool when I say git has solved the problem of asynchronous decentralized collaboration. For local-first async collaboration on something that isn't software development, you'd likely want something that is a lot more polished, and has a much more streamlined feature set. I think ultimately very few of git's chafing points are due to its model of async decentralized collaboration. | ||||||||||||||||||||||||||
▲ | jorvi 4 days ago | parent | prev | next [-] | |||||||||||||||||||||||||
Hey, another hg enjoyer! I miss it too. So much simpler. Apparently 'jujutsu' makes the git workflow a bit more intuitive. Its something that runs atop git, although I don't know how much it messes up the history if you read it out with plain git. All in all I'm pretty happy with git compared to the olden days of subversion. TortoiseSVN was a struggle haha. | ||||||||||||||||||||||||||
▲ | rpdillon 4 days ago | parent | prev [-] | |||||||||||||||||||||||||
Ah, I miss hg. Another cool aspect is that because it was written in Python and available as a library, I was able to write a straightforward distributed wiki based on hg in a single Python script. So much fun. |