D 2011-02-14T14:34:00.844
J comment If\stwo\susers\sare\swriting\sa\swiki\spage,\sand\sthey\sboth\ssend\stheir\schanges,\snone\sreceives\sany\swarning,\sand\sthe\slast\sPOSTing\ssets\sthe\sfinal\scontents.\r\n\r\nI\sthink\sthe\sbest\swould\sbe\sto\sdo\sthe\ssame\sapproach\sas\sin\sfiles,\smaybe\streating\sany\smerge\sas\sconflict,\sand\sleaving\slines\swith\s'<<<<<'\sand\sso\son\sthe\spages.
J foundin [6f42e76d80]\s2011-01-13
J status Open
J title Wiki\sconflicts\sgo\sunnoticed
J type Code_Defect
K c64e665103f04fa390a16879cc9aaec6ac1f5c17
U viriketo
Z 42c761e594d5b18490688984270ea705