couchdb-user mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jens Alfke <>
Subject Re: conflict determination not by fields
Date Mon, 29 Aug 2011 16:36:14 GMT

On Aug 29, 2011, at 9:03 AM, gaoyong pan wrote:

The way of "diff" and "patch" sounds a general approach, is it
possible make this just a built-in capability for couchDB, a general
json diff/patch support.

Diff/patch also produces conflicts that have to be resolved at a higher level — ever had
to do manual merging in a revision control system like SVN or Git? Face it, there is no magic


  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message