Comments on: diff3, merging, and distributed version control http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control What happens at LShift Fri, 21 Nov 2008 18:50:27 +0000 http://wordpress.org/?v=2.0.12-alpha by: tonyg http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108448 Thu, 03 Jul 2008 16:47:58 +0000 http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108448 <p>((I accidentally deleted a bunch of comments I didn't mean to delete today, so I'm having to repost them manually:))</p> <p>tonyg wrote:</p> <p>The idea is to see if it can be put into TiddlyWiki somehow - but there are plenty of other uses for a decentralised JSON synchronisation mechanism: bookmarks, calendar entries, contact lists, …</p> ((I accidentally deleted a bunch of comments I didn’t mean to delete today, so I’m having to repost them manually:))

tonyg wrote:

The idea is to see if it can be put into TiddlyWiki somehow - but there are plenty of other uses for a decentralised JSON synchronisation mechanism: bookmarks, calendar entries, contact lists, …

]]> by: tonyg http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108447 Thu, 03 Jul 2008 16:47:40 +0000 http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108447 <p>((I accidentally deleted a bunch of comments I didn't mean to delete today, so I'm having to repost them manually:))</p> <p>FND wrote:</p> <p>Very cool indeed! I’m looking forward to seeing this implemented as a TiddlyWiki plugin and/or vertical.</p> ((I accidentally deleted a bunch of comments I didn’t mean to delete today, so I’m having to repost them manually:))

FND wrote:

Very cool indeed!
I’m looking forward to seeing this implemented as a TiddlyWiki plugin and/or vertical.

]]> by: tonyg http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108446 Thu, 03 Jul 2008 16:47:20 +0000 http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control#comment-108446 <p>((I accidentally deleted a bunch of comments I didn't mean to delete today, so I'm having to repost them manually:))</p> <p>Elliot Murphy wrote:</p> <p>Wow, this is very cool. Thanks for posting it. What are you using this for?</p> ((I accidentally deleted a bunch of comments I didn’t mean to delete today, so I’m having to repost them manually:))

Elliot Murphy wrote:

Wow, this is very cool. Thanks for posting it. What are you using this for?

]]>