search

benweet / stackedit

In-browser Markdown editor
https://stackedit.io/
Apache License 2.0
21.62k stars 2.71k forks source link

Diff merge during synchronization #1612

Open priyendra opened 4 years ago

priyendra commented 4 years ago

I really love StackEdit.io but have been running into mysterious problems while collaborating with other colleagues. Basically I see two types of problems:

Is this expected or am I hallucinating?

The homepage seems to note the following: "With StackEdit, you can share collaborative workspaces, thanks to the synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes." This suggests that this should not be happening. Any ideas what I might be doing wrong?

priyendra commented 4 years ago

I have another related question about the diff-merge implementation. What does the software do when there is a merge conflict because of two concurrent edits to the same area of the document?

Alextraa commented 4 months ago

I also meet this problem. This is especially a disaster when the network connection to github is not stable, and the synchronization is finished after a long delay, which causes a sudden mess up.