[Pmwiki-users] Brainstorm (Page Locks)
Tue Apr 13 12:15:12 CDT 2004
Patrick R. Michaud wrote:
>>If the changes overlap the second user get's a message that there is a
>>conflict (with the lines marked somehow) and that this needs to be
>>handled (by the user) somehow.
>Actually, I was going to implement it such that the second author would
>get a message that the page changed even if the merge didn't detect a
>direct conflict. Some edits might semantically conflict even if they
>don't directly conflict (e.g., if the second user makes reference to
>something that was deleted by the first user).
What happens, if there are more then two users editing the page? I don't
know how likely that is. But does diff3 still work then? What does diff3
actually do? How does it compare the files?
Are there any pages that describe the algorithm?
More information about the pmwiki-users