Better conflict resolution
planned
J
John Caron
Here is an example of what I am seeing. I am running version 1.48.9 on Windows 11, on a Edge Browser, and on Android. If, for example, I have the current date open on my calendar and it was edited at 8am and I later add a block to the daily page at noon from my phone at work, when I get home I have a dialog box saing that there is a conflict and to choose which version to keep. It seems to me that your sync logic should know that the edit was made to a new block at a later time and that there is no conflict, it is just a new block. I could understand if I were trying to edit the same block at the same time on two different computers, but this isn't the case. Is there a way I can prevent erronious conflict messages from appearing? Thank you!
John
Log In
Beth
Merged in a post:
Improve Local/Remote Version‑Conflict UI & Offer Real‑Time Collaboration
N
Neo 😎
When Capacities encounters a local vs. remote data conflict, two major pain points emerge:
- Losing important edits. Users often struggle to recall which edits came first or later - leading to potential loss of crucial content when choosing which version to keep.
- Hard to compare long pages. The version comparison headers scroll off-screen, making it inconvenient to visually align changes while scrolling vertically.
Proposed Enhancements:
- Sticky headers in conflict view. Lock the version headers at the top of the screen during comparison - allowing users to stay oriented while scrolling through long content.
- Merge editor or real‑time sync. Move beyond binary “keep local or remote” choices. Implement an edit history flow with timestamps - similar to Google Docs, where changes are merged chronologically and users can resolve conflicts at a granular level instead of losing entire blocks of edits.
- Future roadmap: A collaborative editing mode across devices (“always‑on sync”) that leverages timestamps for conflict resolution - eliminating the traditional version‑conflict dialog entirely.
Steffen Bleher
planned
We have improvements on this on the roadmap. I agree that this is not ideal.
J
John Caron
Steffen Bleher Thank you!
Beth
under review