Awesome GitHub RepositoriesConflict Management Systems

Jujutsu is a distributed version control engine designed to manage project history through mutable commits and a persistent operation log. By treating the working directory as a mutable commit, it eliminates the need for manual staging areas, allowing users to modify repository history directly without checking out specific branches. The system maintains full compatibility with existing remote repositories, ensuring that local workflows remain interoperable with standard version control ecosystems. A defining characteristic of the project is its conflict-aware architecture, which treats merge

Stores merge conflicts as persistent objects within the commit history to allow for deferred resolution.