I'd like to resolve conflicts on the device of my choice (most probably desktop > mobile) and see where the conflict originated to resolve them efficiently.
I'm starting with the ideas @tessus brought up regarding tagging conflicts:
Right now for conflicts there is this special notebook Conflicts containing the conflicted notes (named identically if there is more than one conflict for the same note)
- Tag the notes as @tessus suggested (including a counter if there are two or more conflicts at the same time for the same note)
- Make this notebook sync across devices (just like normal notes)