GSoC/GCI Archive
Google Summer of Code 2009 Drupal

Automatic and Manual Conflict Resolver

by Christopher Bradford for Drupal

This project focuses on handling node conflicts. Currently when a user tries to save a node that has been edited (and saved) before they have submitted, an error appears and the edit is blocked. This module aims to resolve these issues automatically if possible. If not, it will provide tools and an interface to interactively merge the two different versions of the node.