Would like an easier way to resolve wiki page edit conflicts

[srussell@…]

If somebody else has submitted a page edit before you do, you currently get a "Sorry, this page has been modified…. Your changes cannot be saved" message with no guidance as to how to resolve the problem. A technical user would be able to resolve this using a combination of page history and re-editing the page. But for moderately technical users, this is burdensome and a simpler interface and/or methodology is needed.

My first-pass suggestion: I would like to see a "Resolve" button that takes you to a page that helps you resolve differences between your changes and the changes that were made "behind your back".

At the simplest level, this could be in UNIX-style text diff format - with some instructions as to how to interpret the resulting text output.

Even better: A UI view that looks something like the current page history view but also includes the changes you tried to submit. Every change could have a checkbox next to it, which will allow the user to select whether or not they want to include that change in the resulting document (with "smarts" for whether the default for a change should be include or not include). "Submit" would then submit their changes.

(And yes, another user could change the page again while you are resolving your changes. :-))

[anonymous]

This is kind of the same as #723 which is a duplicate of #152. Locking the page would be easier to implement then doing a resolve of conflicts.