folks here might enjoy this — Backstitch is a plugin for the Godot game engine that adds collaboration and local-first version control. It's creation was motivated by a nonprofit trying to teach game dev to kids, suffering miserably because of (drumroll)... git merge conflicts. Yeah, people were trying to teach git to kids. cuz, like.. you need version control! That's table stakes. So the backstitch folks are like "stop giving cigarettes git to these kids! we'll build a thing on top of Automerge that will avoid most merge conflicts, and when conflicts do arise they'll be easier to solve because we're doing things in terms of the Godot GUI, with rich previews, rather than in terms of the serialized text format (where conflicts cause the godot scene file to become unopenably broken)" So here's a talk by Lilith Duncan, one of the backstitch devs along with Nikita Zatkovitch and @Paul Sonnentag.

This is the n'th+1 time I'm hearing about about automerge and apparently I've been sleeping on the tech..

it's pretty good! (i am biased of course)

"remember how I said you don't need git? here's a game jam use case for hosting your starter project on git" im going to love this, excited to learn about godot scene merge gore