How do a get rid of this red-highlighted Conflicts folder?

Support
1

Operating system

macOS

Joplin version

2.13.9

Desktop version info

Joplin 2.13.9 (prod, darwin)

Client ID: 5ea0fbd8aff74adc88b66d3f8ce49607
Sync Version: 3
Profile Version: 44
Keychain Supported: Yes

Revision: 1bbec44

Sync target

Joplin Cloud

Editor

Markdown Editor

What issue do you have?

I have 2 Mac computers syncing to Joplin Cloud:

  • Mini
  • MacBook Air

Both running same Joplin version.

I had made some significant changes to folders and files on Mini. When I syncd the MacBook there were conflicts and therefore a red-highlighted Conflicts folder was created, etc. BTW: I read the docs on conflicts, so I understand the justification here.

I evaluated the files in this new Conflicts folder and see that most are identical on both machines.

I have 2 questions:

1.) Why were identical files added to this Conflicts folder? (I'm sure not all were identical, but many were.)

And more importantly (for me...)

2.) How do a get rid of this red-highlighted Conflicts folder?

2

Without seeing the full history of the data it is difficult to answer the former but to get rid of it you just resolve the conflicts/delete the conflicted notes.

3

I deleted all the notes in Conflicts folder and the folder went away.

Regarding question #1 it would be nice to know what happened; but, like you said, "without seeing the full history it's difficult to answer".

Thank you.