| ▲ | rurban 2 hours ago | |
Next paragraph. The conflicts are not resolved. Or just use the non-solution as in git (or wikis). Leave it to human manpower. | ||
| ▲ | lorenzleutgeb 39 minutes ago | parent [-] | |
For the source code in the repository, conflicts must be merged by users (or their tools, like `mergiraf`), just like with any other Git repo containing source code. What might confuse you is the mention that a collaborative object may opt in to ask the user to resolve a conflict. Well, in this case, strictly speaking, it's not a CRDT anymore of course. But none of the collaborative objects commonly used in Radicle use this escape hatch. It is clear that Git itself does not give you CRDTs, but Radicle implemented CRDTs on top of Git, which is entirely possible. This is also what's explained in the Protocol Guide. I don't understand what's the misunderstanding here, sorry. | ||