Ticket UUID: | c64e665103f04fa390a16879cc9aaec6ac1f5c17 | ||
Title: | Wiki conflicts go unnoticed | ||
Status: | Open | Type: | Code_Defect |
Severity: | Priority: | ||
Subsystem: | Resolution: | ||
Last Modified: | 2011-02-14 14:34:00 | ||
Version Found In: | [6f42e76d80] 2011-01-13 | ||
Description & Comments: | |||
If two users are writing a wiki page, and they both send their changes, none receives any warning, and the last POSTing sets the final contents.
I think the best would be to do the same approach as in files, maybe treating any merge as conflict, and leaving lines with '<<<<<' and so on the pages. |