Query: prophet::resolver::identicalchanges
OS: debian
Section: 3pm
Format: Original Unix Latex Style Formatted with HTML and a Horizontal Scroll Bar
Prophet::Resolver::IdenticalChanges(3pm) User Contributed Perl Documentation Prophet::Resolver::IdenticalChanges(3pm)METHODSattempt_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. o When the new-state of the conflicting change matches the previous head of the replica. o 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. perl v5.10.1 2009-12-22 Prophet::Resolver::IdenticalChanges(3pm)
Similar Topics in the Unix Linux Community |
---|
awk or sed - Convert 2 lines to 1 line |
Detecting unused variables... |
One instance of comparing grep and awk |
Weird 'find' results |
My first PERL incarnation... Audio Oscillograph |