local and remote modifications are prompted about, even if the same
Created by: @gdt
When making more changes than the server can accept at once, it's possible to have a write operation to the server time out so that the change is made on the server, but CardBook doesn't get the ack (I am 99% sure). Then, one gets "card x is modified locally and on the server". That's great if there is a true conflict. But if the contents of each field is the same, even if the generation number/etc. differs, it would be nice to update the local metadata silently and to not consider this a conflict.
(Somehow, I get the same conflicts on each sync, I think because they are scheduled for later somehow and my syncs are failing until I do 20. So I have set "prefer server" for now, because I don't mind if I have to recategorize and don't want to lose any real data.)