Does anybody know of a good Javascript implementation for a three-way merge of JSON objects (including merging of the strings)?
Version control, collaborative editing and undo
21–30 of 32 posts
Re: Version control, collaborative editing and undo
#22Recording changes as they happen is easier than inferring them after the fact That's all very well if you're trying to develop something like Google Docs, where you can define change semantics the merge process understands, then constrain the editors to only allow changes that follow those semantics. But the moment a user wants to take the code out of your editor to process it with some other tool - perhaps they want…
It seems to me that the Eve folks have already decided to make that tradeoff though: a richer environment that is necessarily walled off at least a bit from the traditional "it's all text" approaches.
Smalltalk didn't take over the world with that approach, but it's certainly interesting to explore.
Re: Version control, collaborative editing and undo
#23Recording changes as they happen is easier than inferring them after the fact That's all very well if you're trying to develop something like Google Docs, where you can define change semantics the merge process understands, then constrain the editors to only allow changes that follow those semantics. But the moment a user wants to take the code out of your editor to process it with some other tool - perhaps they want…
In Cloud9IDE they've done a very amazing job of integrating collaborative editor with bring your own server. From what I've been able to tell, both the built-in editor and filesystem watches will trigger change operations and the two are used together to produce a very seamless user experience.
Re: Version control, collaborative editing and undo
#24An alternative to OT is Differential Synchronization. You can find out more here:
https://neil.fraser.name/writing/sync/
I wrote this to help me understand the algorithm:
Re: Version control, collaborative editing and undo
#25Earlier quoted context omitted.
Audit trail bread crumbs are currency, for research, expression, and development at log scale. Right now I am lost with git and mercurial, Gist has better visual diffing than standard repos, yet standard repos have better granular linking. Gitchain/Mercurialchain would help the world if there was a log-long-term where every bit was actually accountable, versus our current war text processing by taking logological lea…
Man, that looks an awful lot like the kind of things a bot might say.
It looks more schizophrenic than bot to me.
Re: Version control, collaborative editing and undo
#26Shout out to "Out of the tarpit" [1] that's referenced in the "functional-relational" link in the article. This is a great paper that's well worth 20 minutes of your time to read! [1] http://shaffner.us/cs/papers/tarpit.pdf
You can read that in just 20 minutes?
Re: Version control, collaborative editing and undo
#27Earlier quoted context omitted.
Audit trail bread crumbs are currency, for research, expression, and development at log scale. Right now I am lost with git and mercurial, Gist has better visual diffing than standard repos, yet standard repos have better granular linking. Gitchain/Mercurialchain would help the world if there was a log-long-term where every bit was actually accountable, versus our current war text processing by taking logological lea…
Man, that looks an awful lot like the kind of things a bot might say.
[deleted]
Re: Version control, collaborative editing and undo
#28> The standard solution to any hard problem [which is] is to find someone who solved it already and steal their answer. Reminds me a little of the Feynman algorithm. 1) Write your question into google. 2) Open the first three results. 3) Copy what you find. Does it already have a name?
"Stacksort" is probably the right thing to bring up here. A sorting algorithm that searches SO and copies code from there until the list is sorted.
Origin: https://xkcd.com/1185/
Implementation: http://gkoberger.github.io/stacksort/
Re: Version control, collaborative editing and undo
#29Recording changes as they happen is easier than inferring them after the fact That's all very well if you're trying to develop something like Google Docs, where you can define change semantics the merge process understands, then constrain the editors to only allow changes that follow those semantics. But the moment a user wants to take the code out of your editor to process it with some other tool - perhaps they want…
It seems to me that the Eve folks have already decided to make that tradeoff though: a richer environment that is necessarily walled off at least a bit from the traditional "it's all text" approaches. Smalltalk didn't take over the world with that approach, but it's certainly interesting to explore.
I'm not sure what makes it interesting to explore; it is hard to imagine a more reliable way to doom a programming tool to failure.
Re: Version control, collaborative editing and undo
#30Earlier quoted context omitted.
Man, that looks an awful lot like the kind of things a bot might say.
It looks more schizophrenic than bot to me.
Judging text minus emotion is basically why Bit451 is meaningful as Gitchain for stable social currency, between revision history edits at war.
"Communication does not depend on syntax, or eloquence, or rhetoric, or articulation but on the emotional context in which the message is being heard. People can only hear you when they are moving toward you, and they are not likely to when your words are pursuing them. Even the choicest words lose their power when they are used to overpower. Attitudes are the real figures of speech.” —Edwin H. Friedman
Farenheit 451 is now socialized by grammar before words hit the books.