2024-07-06 - Do you recommend where to start resolving conflicts?

Based on this, I think the large number of conflicts are related to the frequently-changing updated_time. I'm linking to my comment on the other topic with a few notes related to that.

Would a mobile compatible conflict resolution plugin be helpful for this? (One doesn't exist, that I'm aware of, but if it would be helpful, I would be happy to look into creating one!)

Earlier, I started working on a simple mobile-compatible conflict resolution plugin based on @codemirror/merge. On reflection, however, I'm not sure how helpful this would be:

  • Showing the difference between a conflict and its note won't help resolve attachment conflicts.
  • It's difficult to manually check the diffs for each item in the conflicts folder.
  • A similar plugin for desktop already exists.
3 Likes