Edit Conflict Detection - WikkiTikkiTavi

Edit conflict is detected if:

The current version is different from what it was when "edit" was last clicked; and
Your IP address is different from whoever last saved to the page.

If you conflict with another editor (with a different IP address), then the conflict resolution page appears. The software assumes you are the same person and know what you're doing if you're coming from the same IP address.

-- ScottMoonen, others

Thanks. --JohnAbbe

I have just tested this problem. Seems the last editor wins, in any case. What about the following:

When you want to edit a page that someone else has begun editing some time ago (up to 10 mins or so) and not yet saved, you get a warning about this.
If the page has changed since you began editing it, this should throw an error and bring you back to editing your version of the page. So you can still copy it out and bring in your changes to the new version.
Anyone has the time to code something to bring your changes into the changed version of the page? ;-)

--LonelyPixel

Wow:

Warning: since you started editing, this document has been changed by someone else. Please merge your edits into the current version of this document.

But the check for the same IP could be a problem when using the same proxy....

--LonelyPixel?

How about an additional check to see if the UserName differs? This would reduce the risk from proxies. --RichardCyganiak

This would be a nice feature! Right now we've got our Wiki on our webserver, but accessing it from our office machines (all NATted through the same router) we appear as the same IP. --NobodyInParticular

EditConflictDetection