> Git merges the code line-by-line, But git only deals with text files, usually source. Data schemas are a horse of a different color.
On Mon, Aug 29, 2011 at 10:35 PM, gaoyong pan <[email protected]> wrote: > 2011/8/30 Jens Alfke : > > > > 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 solution. > > > > —Jens > > > > Git merges the code line-by-line, if changes are not in the same line, > there will be no conflict happening, can conchdb do better to merge > document field-by-filed? if two changes are not on the same field, > then there will be no conflict happening actually. if same field is > updated, then human should resolve the conflict just like what git is > working. > -- > Pan >
