Benjamín Eidelman

I see, yes, it's an error in the `objectHash` function used in the demo page, maybe the lib could prevent this with extra checks? but this would be fixed if...

I think `typeof null === object`, I don't know, this is a bit on user-space, but I think for the demo if obj === null, I would go to the...

this is a big pending item, I would like to have configurable strategies, but at the moment when a conflict is found the resolution is last-wins unless it's not easy...

this is a related ticket: https://github.com/benjamine/jsondiffpatch/issues/39 where a discussion happened about combining 2 deltas, that would be a solution to this problem. (nothing was done though unfortunately)

Thanks, I understand this request, but I don't want last-wins to be the default, I want any conflict to raise an error (although I'm aware implementation for this might be...

cool, yeah, some initial thoughts: - the hardest part would be to combine 2 text diffs (AFAIK google diff match patch doesn't provide that), in case that gets hard to...

yep, with text diffs I mean cases where 2 long strings are diffed and the google diff match patch lib is used to generate a unidiff, eg: ``` @@ -638,17...

@borromeotlhs actually, I think the original description matches more a `git squash`, as I understand the deltas to combine would be a sequence of changes made to one object, not...

@malhar-trivedi it doesn't use recursion actually, it uses a linked list, I'd like to know how did you determined otherwise. But I'm curious to see a test case can you...

Test1 is a duplicate of #72, Test2, might be related, but yes representing array moves, adds, deletes, and updates (inside an element) is challenging. Test3? yes, the unchanged values seem...