-----Original Message----- From: openguides-london-bounces@openguides.org [mailto:openguides-london-bounces@openguides.org]On Behalf Of Kate L Pugh Sent: 09 June 2004 15:09 To: andrea@workbike.org; Discussion of the Open Guide to London. Subject: Re: [OpenGuides-London] (no subject)

This means that the someone's added something to the page since you loaded up the edit form. If it just let you save your changes then it would overwrite the other person's changes, so instead it gives you the edit boxes with what the other person wrote, and you need to add your changes in to that.

It would be nice if it could do this automatically, but this is a slightly hard thing to do and so we haven't written the code to do that yet.

I've already got standalone merging working for VCS::Lite. Integrating this with CGI::Wiki and OpenGuides will join the increasing list of items waiting on my round tuit.