fix(sync): stop receive-side mutation before conflict loss (#150) - #168

fix(sync): stop receive-side mutation before conflict loss (#150)#168

psimaker wants to merge 2 commits into

mainpsimaker/vaultsync:mainfrom

fix/issue-150-loss-aware-conflict-retentionpsimaker/vaultsync:fix/issue-150-loss-aware-conflict-retentionCopy head branch name to clipboard