>-----Original Message-----
>From: Your EPEC ICT Team - Ricardo Rodríguez [mailto:webmaster@xen.net]
>Sent: Saturday, March 24, 2007 06:49 AM
>To: mediawiki-l(a)lists.wikimedia.org
>Subject: Re: [Mediawiki-l] simultaneous edition
>
>
>>>> Platonides(a)gmail.com> 24/3/2007 00:24 >>
>
>>Without it, almost always two people edit the same page at the same
>>time, the second one get an 'edit conflict'. With it, it automatically
>>merges most of them without annoying the user.
>>
>>Un saludo
>
>The problem seems to be that we frequently are out of the "almost always" :-)
>
>What is the behaviour must we expect when this happens? As far as we see here, once the "second" user hits the Save button, it is redirected to a kind of "difference between revisions" showing the differences between the current version and the "in troubles" page.
>
>Please, how must we proceed? By saving the wiki markup in, for instance, a notepad file, login out (if anonymous edition is disable as it is here, waiting until the page is available and copy-pasting then what we consider the new markup? I think this is a bit dangerous: I don't know if more changes have been introduced since I copied the page contents.
>
>Any advice will be welcome! Thank you in advance,
>
>Saludos!
>
>Ricardo
I'm not sure if your question is about coding or editing. When an edit conflict happens you need to hit your back button and save the new content, which, hopefully, is in a compact section. Then you need to take a look at the other edit, by checking the edit history. Not a good idea to simply replace it. If both edits are spread all over the page, all you can do is start over. So a good habit not to make extensive edits over the entire text of a popular article, especially if you are taking a lot of time. I can't imagine a coding solution for conflicts between two edits when both make numerous changes spread over the whole article.
Fred