On ven, 2002-03-01 at 20:50, koyaanisqatsi(a)nupedia.com wrote: Changes that don't conflict with one another could be integrated fairly easily, as long as the upload indicates which revision of the article you were working from. (CVS does this with source code, for instance.) Actual conflicts -- changes that affect the same part of the text in both revisions -- are more difficult. Probably we would want to handle this the same way that we do it now within the web interface: throw up an edit conflict and ask the user to manually reconcile the two versions. The edit conflict process needs to be improved in any case; including a diff with the edit conflict screen has been recommended, which I heartily endorse, but the diff function is currently quite limited: removes and adds are not shown in sequence, and small changes in large paragraphs are very difficult to see. -- brion vibber (brion @ pobox.com)

// Suggestion #4: Avatar Evil Suggestion I like the actual look & feel of Wikipedia. But.. Can be improved with icons views of data. You can visually pack more info with icons, helping people sorting and finding information. Icons view of older versions of files. Icon for Talk Icon for users edit this page ( with avatars? ) I suggest this looks and feel: - windows 95 big icons view - winjabber buddylist view - etc.. 1 saludo Tei RatBert At 20:50 1/03/02 -0800, you wrote: the software reconcile different edits from the same point? i rather prefer the current system, where you can go in and choose the best bits of each to save. I don't foresee software being that sophisticated within our lifetimes. maybe you have some ideas about it.