[gritzko]

That is very very interesting. I work on a similar project https://replicated.wiki/blog/partII.html

I use CRDT merge though, cause 3-way metadata-less merges only provide very incremental improvements over e.g. git+mergiraf.

How do you see got's main improvement over git?

[odvcencio]

primarily, got is structural VCS intended for concurrent edits of the same file.

it does this via gotreesitter and gts-suite abstractions that enable it to: - have entity-aware diffs - not line by line but function by function - structural blame - attribution resolution for the lifetime of the entity - semver from structure - it can recommend bumps because it knows what is breaking change vs minor vs patch - entity history - because entities are tracked independently, file renames or moves dont affect the entity's history

when gotreesitter cant parse a language, the 3way text merge happens as a fallback. what the structural merge enables is no conflicts unless same entity has conflicting changes

[gritzko]

I think I understand the situation.

[odvcencio]

gah,. sincere apologies for formatting of this post. i ahve been on HN for basically 10 years now without ever having made a post (:

[dorianmariecom]

use four spaces " " in front of a line for <pre> formatting

    like "    this"

[srcreigh]

It's 2 or more spaces, not four

[dorianmariecom]

today i learned