On Mon, Mar 2, 2009 at 1:17 PM, mdipierro <mdipie...@cs.depaul.edu> wrote: > > You can do team development via the admin interface. No special > settings required. > > If user A and B edit the same file at the same time, and A saves > first, when B tries to save, web2py goes in a conflict resolution > mode. You can give this a try (by manually editing a file and then try > to save from admin).
Either this does not work as expected or I do not understand it: If I edit default/index.html in an external editor, save it, and save afterwards from the web2py admin editor, the confilict resolution page is shown, but regardless what I select from the checkboxes, the version from the external editor wins all the time. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to web2py@googlegroups.com To unsubscribe from this group, send email to web2py+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
