12 Jan
2007
12 Jan
'07
7:27 p.m.
Hi Steve,
This is correct, there's no merge right now. It would be a nice
feature to have in the future. Patches and contributions are most
welcome.
Note that to prevent the risk of edit conflicts there are 2
strategies in place already:
1) If someone is editing a page and someone else tries to edit it too
he'll receive a warning mentioning that the other person is editing
the page but he's allowed to force the edition (to allow for cases
where the first editer has not cleanly saved or cancelled the page).
2) You can edit sections. This doesn't lock the full document (only
the section).
Thanks
-Vincent
On Jan 12, 2007, at 7:00 PM, Steve Z wrote:
Hi,all
I tried xwiki and found it hadn't deal with "Edit Conflict"
condition. It treats with "Edit Conflict" (concurrently edit same
version record and save not concurrently) by saving as two different
version simply, without notification for later save editor and without
"Merge" assistant。
How about you think about ? maybe I was wrong?
--
Best Regards!
--
You receive this message as a subscriber of the xwiki-
users(a)objectweb.org mailing list.
To unsubscribe: mailto:xwiki-users-unsubscribe@objectweb.org
For general help: mailto:sympa@objectweb.org?subject=help
ObjectWeb mailing lists service home page: http://www.objectweb.org/
wws
___________________________________________________________________________
Yahoo! Mail r�invente le mail ! D�couvrez le nouveau Yahoo! Mail et son interface
r�volutionnaire.
http://fr.mail.yahoo.com