At 01:26 PM 3/13/05, Rowan Collins wrote:
---snip---
If you submit a page and somebody else has saved a version since you
clicked "edit", the code will first attempt to use "diff3" (if
present
and correctly referenced in LocalSettings.php) to merge the two sets
of changes automatically; if that fails, you will be given an "edit
conflict" screen with the two conflicting versions in textareas and a
diff, and ask you to merge them by hand.
---snip---
I have noticed when editing articles on WikiPedia, that I'll sometimes get
an edit conflict presentation, although I'm sure that I'm the only one
editing. And there won't be any major difference between the versions
presented. So I'll just tell it to save one.
I've had one similar situation on my wiki, and I couldn't get out of it. I
had to abandon and come back in fresh.
Ideas?
James Birkholz
admin, Posen-L mailing list and website
http://www.Posen-L.com