Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Question about conflicts #230

Open
narFnarF opened this issue Apr 25, 2021 · 0 comments
Open

Question about conflicts #230

narFnarF opened this issue Apr 25, 2021 · 0 comments

Comments

@narFnarF
Copy link

Hi

This is a question (not a bug).

I'm wondering if it's possible, via the config or some other ways, to have the following behavior:

When there a conflict (the same file was edited on both the initiator and the target), instead of hiding the backup copy in .osync_workdir/backup/, to have both copies of the file kept in place, by changing the filename.

For example, if there's a conflict on toto.txt, the one that osync normally keeps is kept as toto.txt, but the backup is kept as toto-conflicted copy 2021-04-24 2359.txt, and that backup is kept in the same folder, next to toto.txt

Is that possible?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant