NAME

Prophet::Resolver::IdenticalChanges

VERSION

version 0.751

attempt_automatic_conflict_resolution

Given a Prophet::Conflict which can not be cleanly applied to a replica, it is sometimes possible to automatically determine a sane resolution to the conflict.

When the new-state of the conflicting change matches the previous head of the replica.
When someone else has previously done the resolution and we have a copy of that hanging around.

In those cases, this routine will generate a Prophet::ChangeSet which resolves as many conflicts as possible.

It will then update the conclicting changes to mark which Prophet::ConflictingChanges and Prophet::ConflictingPropChanges have been automatically resolved.

AUTHORS

Jesse Vincent <jesse@bestpractical.com>
Chia-Liang Kao <clkao@bestpractical.com>
Christine Spang <christine@spang.cc>

COPYRIGHT AND LICENSE

This is free software, licensed under:

  The MIT (X11) License

BUGS AND LIMITATIONS

You can make new bug reports, and view existing ones, through the web interface at <https://rt.cpan.org/Public/Dist/Display.html?Name=Prophet>.

CONTRIBUTORS

Alex Vandiver <alexmv@bestpractical.com>
Casey West <casey@geeknest.com>
Cyril Brulebois <kibi@debian.org>
Florian Ragwitz <rafl@debian.org>
Ioan Rogers <ioanr@cpan.org>
Jonas Smedegaard <dr@jones.dk>
Kevin Falcone <falcone@bestpractical.com>
Lance Wicks <lw@judocoach.com>
Nelson Elhage <nelhage@mit.edu>
Pedro Melo <melo@simplicidade.org>
Rob Hoelz <rob@hoelz.ro>
Ruslan Zakirov <ruz@bestpractical.com>
Shawn M Moore <sartak@bestpractical.com>
Simon Wistow <simon@thegestalt.org>
Stephane Alnet <stephane@shimaore.net>
Unknown user <nobody@localhost>
Yanick Champoux <yanick@babyl.dyndns.org>
franck cuny <franck@lumberjaph.net>
robertkrimen <robertkrimen@gmail.com>
sunnavy <sunnavy@bestpractical.com>