You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I want to implement a function (diff3 a o b) where o is common ancestor of a and b. The straightforward solution is combining editscripts of two diffs: (patch o (combine (diff o a) (diff o b))). But I stuck with detecting conflicts when concurrent updates happens at same place in a and b.
Is there any known solutions or algorithms of iterating over those editscripts and finding conflicting nodes?
The text was updated successfully, but these errors were encountered:
Depending on what you want to do, you may not need three-way merge. For example, for synchronizing collaborative edits, Differential Synchronization should work on all kinds of data structure in principle. https://neil.fraser.name/writing/sync/
I want to implement a function
(diff3 a o b)
whereo
is common ancestor ofa
andb
. The straightforward solution is combining editscripts of two diffs:(patch o (combine (diff o a) (diff o b)))
. But I stuck with detecting conflicts when concurrent updates happens at same place ina
andb
.Is there any known solutions or algorithms of iterating over those editscripts and finding conflicting nodes?
The text was updated successfully, but these errors were encountered: