3 ms·

I agree that git is a great model, however it's often hard to explain to new users why merge conflict require time to resolve, and nothing saves you from the ad

• chubot 6y ago
  git isn't completely centralized either. You can centralize it like Github, and that plays an important role in the ecosystem. Decentralization is a spectrum, not the opposite of centralization. ---- One way to partially address to merge conflict problem is to explode application files into directory hierarchies. For example, Word .doc files and Photoshop .PSD files are basically huge hierchical data structures inside a single file. I believe video formats also have significant hierarchical structure. A lot of them even have immutable portions and mutable portions -- e.g. for storing an entire version history. So if those were exploded into something that the OS (or tools like git/rsync) could understand, like a tree of files, then you would have a lot fewer merge conflicts. That's how people tend structure their git repos too. If you have a frequently edited file that's hard to merge, then that's a smell, and you can fix it. This won't solve every problem but again there needs to be something in between "rewrite Photoshop as Figma" and "email around a bunch of PSD files" (which is a very flaky distributed system on top of e-mail.)