Merge changes automatically, unless there is an "actual" conflict
Zuzu Typ
Let's assume we have two people editing the same document. If Person A adds / changes a few lines in section 1 and Person B adds / changes a few lines in section 3 - that isn't a merge conflict that requires manual resolving. Both changes can simply be combined into one.
If on the other hand Person A edits lines in section 1 and Person B edits the same lines in section 1 - that is a conflict that needs manual resolving. Someone needs to decide which parts of either edit should go into the final change.
It would be great if the first type of conflict could be merged automatically, because the diff-view is really difficult to read and use.
That would also be what people are used to from GitHub / GitLab or other version control platforms.
Sahil Shah
Would this not be supercedes by https://requarks.canny.io/wiki/p/real-time-editingcollaboration-like-gdocs?
Zuzu Typ
Sahil Shah: Unless it would be an optional feature, yes. Thank you for the link!
Sahil Shah
Zuzu Typ: I do still see a value in having a merge conflict resolution if two edits were made that can’t be resolved in real time editing, but probably best to have that discussion there.