Repository navigation
feat(sync): per-account conflict policy - #339
Merged
Merged
Conversation
Keeping both copies stays the default and does not change. The new option keeps the newest side and drops the older one, so no conflicted copy is written to the folder. A file/directory collision is never resolved by the policy: dropping a directory because the other side has a file is destructive, so those keep the safe behaviour. Closes #338
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #338.
The engine always wrote a
(Nextcloud conflicted copy <date>)file when the same path changed on both sides. This adds a per-account policy in Advanced synchronization:The policy is applied in the reconciler, so the copy is never written in the first place. A file/directory collision is never resolved by the policy: dropping a directory because the other side has a file is destructive, so those keep the current safe behaviour.
Tests cover the three reconciler cases (local newer uploads, remote newer downloads, type collision stays a conflict) and the config default and parsing. ES strings included.