👨🏻‍💻 Moroni Have you tried [Jujutsu](https://github.com/martinvonz/jj)? It's a Git-compatible version control system.