Where are the conflict resolution options in Settings?

Help
1

@CawlinTeffid where are those file merge options in Settings? I can’t find them anywhere…

2

Settings > Sync > Conflict resolution. It was added in version 1.9.10.

3

I have the conflict resolution checked, but I can’t find the file that keeps track of the conflicts. Any idea where that is?

4

There is no place that keeps tracks of conflicts. For each note, either the conflict is automatically resolved (automatically merge option) or a copy of the file with “conflicted copy timestamp” suffix is generated (“create conflict file” option).

5

@PhotoBomb In the Sync log you can filter to show only merge conflicts (if any), but the log only covers what has happened since the last time the app restarted.

For now I have bookmarked a search for File:"conflicted copy".

2 Likes
6

Thanks.

7

This topic was automatically closed 28 days after the last reply. New replies are no longer allowed.