Git is the best snapshot-based VCS we have, I use it daily and I love it. But it's not perfect, specially the stupid ways in which merges fail due to the system not being patch-based. I worked a lot with rebase heavy workflows, maintaining a set of patches with varying bases. That's a powerful workflow and doable in git, but not ideal, it fails with conflicts more than you would expect and that adds unnecessary maintenance burden.
One day we'll move on from git just like we moved on from centralized VCS. My hope for the next iteration of VCS is a patch-based distributed system. Currently Pijul seems like the best fitting candidate: https://pijul.org/
One day we'll move on from git just like we moved on from centralized VCS. My hope for the next iteration of VCS is a patch-based distributed system. Currently Pijul seems like the best fitting candidate: https://pijul.org/
Comment