Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

In the happy case? Its no different. But in the case where two offline edits happen at the same location, Git's merging knows to flag the conflict for human review. Thats the part that needs to be fixed.


It's not clear to me what you want to replace from git then, it seems to me that you rather want to take concepts from git.


I want a tool with the best parts of both git and a crdt:

- From CRDTs I want support for realtime collaborative editing. This could even include non-code content (like databases). And some developer tools could use the stream of code changes to implement hot-module reloading and live typechecking.

- From git I want .. well, everything git does. Branches. Pull requests. Conflict detection when branches merge. Issue tracking. (This isn't part of git, but it would be easy to add using json-like CRDTs!)

We can do almost all of that today. The one part that's seriously missing is merge conflicts.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: