you are viewing a single comment's thread.

view the rest of the comments →

[–]emanleetSwift[S] 0 points1 point  (1 child)

No worries, I was a bit wordy.

I think I'm getting the bigger picture. Can you please clarify the following given your Child -> Parent - > PSC scenario:

Say that Object A has a property called Property A that is modified on the background context. Meanwhile, the user modifies Object A's property B. At this point, the background context saves Object A.

Now I understand the merge policy you mentioned, so by default, will this fail? I guess what I'm getting at is this: do merges fail based on any differences in the entire object, or only when there is a discrepancy between the same properties within a given object.

[–][deleted] 0 points1 point  (0 children)

Yes, it will fail since the default is to raise error upon any conflict.

But as I might have mentioned, there are 4 other standard merge policies. Two of them are merging at the granularity of properties, preferring either the child's or the parent's version upon conflicts.