Please confirm and promote this activity by assigning it to its owner, listing it or scheduling it at the Hackathon wiki page and by placing it in the right column at Wikimania-Hackathon-2015. Thank you!

@awight are you planning to work on this task at Wikimania?

@Qgil
Very much so--I have a talk that was accepted, but unfortunately I've been trying to deal with this mysterious cancellation for a month now, with no response. The organizers are clearly overloaded, any suggestion how to proceed with getting myself back on the schedule?

@awight, I cannot help with the Wikimania schedule as I'm involved only in the Wikimania Hackathon organization. Maybe you should contact the user that did that change directly?

So, fine tuning my question. Is this an activity you will work on during the Wikimania-Hackathon-2015? I just want to see whether this is a confirmed hacking project (or a meeting to be scheduled at the hackathon).

@Qgil, thanks for the clarification. No, I don't plan to do this at the hackathon, I'm mainly interested in reaching out to editors and gathering requirements.

@awight what is the status of this proposal? Have you been working more on collecting interest and/or working on a prototype?

A three-way merge would be an interesting way to handle edit conflict. Git-like cherry-picking is also useful in repairing vandalized pages that could not be resolved by simple revert.

In T91137#5116748, @mys_721tx wrote:

A three-way merge would be an interesting way to handle edit conflict.

We have been doing that for the past ten years or so.