Merging of conflicting edits after going online about harika HOT 2 OPEN

To avoid such case I was planning to add time travel, so you can travel to any state of the block note at a time.

Yep, if combined with an alert that there were conflicting writes, it should be enough for the beginning 😉.

Feel free to close this issue as I myself do not plan to implement this support (also due to lack of time 😢) or leave it open for potentially intersted devs.

from harika.

Hi!

Actually I am going to freeze my project for the better time 😓 I don't have enough time/money to keep working on it, and I got a job at Remnote.

I will be working on just random bag fixes, but no new features/improvements.

As for the merge conflict resolving — last write wins. But at also merge nodes for the same parent. Like:

Client 1:

- A
  - B
  - C
  - new: F

Client 2:

- A
  - B
  - C
  - new: D

After resolve they will be merged to:

- A
  - B
  - C
  - D
  - F

The worse case — if A was deleted on client 1, on client 2 it will be deleted too even if you are some new children.
To avoid such case I was planning to add time travel, so you can travel to any state of the block note at a time.

from harika.