With Anki the sync works perfectly until it doesn't and the app asks you to choose the copy you want to keep. Thankfully it doesn't happen often and hasn't caused any trouble for me, but it (seemingly) has no options for manual conflict resolution.

▲

ktosobcy 4 days ago | parent [-]

Hmm... it requires full sync if you edit the fileds of template.

In the past it required full sync due to conflict but in the last ~2 years (maybe) I haven't run into such probelm (I guess periodic sync in the background eliminating to much of a backlock probably helps)

	▲	Anonyneko 3 days ago \| parent [-]
		Last time it asked me to do a full sync when I changed a single card to use a different template (because I had mistakenly used a wrong template when creating it). The fact that everyday sync works perfectly is still mighty impressive though.