2011-10-13 | Paul Boddie | file changeset files shortlog | Added support for merging competing edits, opening the editor on a page where already approved changes conflict with competing queued changes. Changed the directives removal function to return directive values so that the parent revision can be obtained and used to retrieve the target page's body for that revision. |
paul@2 | 1 | Perhaps record the parent version of the edited page so that merges can be done |
paul@2 | 2 | between queued and normal edits. |