eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'Diff3ExclusiveVisitor':

Home

Documentation
www.exept.de
Everywhere
for:
[back]

Class: Diff3ExclusiveVisitor


Inheritance:

   Object
   |
   +--Diff3InclusiveVisitor
      |
      +--Diff3ExclusiveVisitor

Package:
stx:libtool
Category:
Collections-Sequenceable-Diff
Version:
rev: 1.2 date: 2014/02/25 07:00:15
user: cg
file: Diff3ExclusiveVisitor.st directory: libtool
module: stx stc-classLibrary: libtool
Author:
Tony Garnock-Jones <tonyg@lshift.com>

Description:


A Diff3ExclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection 
merge that resolves 'false conflicts' (a.k.a 'accidental clean merges') by accepting the 
changed text as a non-conflict in the merge result.


[instance variables:]

[class variables:]


Related information:



Instance protocol:

as yet unclassified
o  isTrueConflictBetween: left and: right
A conflict is 'false' when, from a particular ancestral snippet, both the left and right branches have changed to have the same contents. In some circumstances this can be treated as a clean merge; in others, it's actually an exception that needs to be dealt with. See http://revctrl.org/AccidentalCleanMerge.

o  left: left original: original right: right



ST/X 7.1.0.0; WebServer 1.663 at exept.de:8081; Sun, 22 Jul 2018 06:39:03 GMT