[pmwiki-users] Burnt! Simultaneous edit lost :-(

[Joachim Durchholz]

Patrick R. Michaud schrieb:
> 
> Yes, this is a known bug -- I just haven't had a good opportunity
> to fix it yet.

How about a "simplistic diff3 substitute"?
I.e. PmWiki should simply assume that both edits changed everything. 
That would give wikitext like this:
   <<<<<<
   Page as saved by author 1
   ======
   Page as saved by author 2
   >>>>>>
It will still be awkward to merge everything manually, but at least 
authors don't lose their edits. And it should be easy to implement, as a 
stop-gap measure until you get around to implementing a better fix.

Regards,
Jo