There is pijul.
- Pijul's defining feature is its innovative algebra of patches model for version control, allowing changes to be applied in any order without creating conflicts, thus simplifying collaborative work.
- It efficiently handles branches and merges, with its patch theory often enabling it to automatically resolve conflicts, eliminating much of the headache typically associated with merge conflicts.
- Pijul is also free and open-source
Check this out: https://stackoverflow.blog/2023/05/23/for-those-who-just-dont-git-it-ep-573/