There was Weave which just uses git for VCS and tree-sitter for conflicts. Gritz...

		conartist6 12 days ago \| parent \| context \| favorite \| on: Ki Editor - an editor that operates on the AST There was Weave which just uses git for VCS and tree-sitter for conflicts. Gritzko is on-thread with his Beagle system, and I'm here too for BABLR ; )

		help