Conflict Strategies

Identifier:

com.ibm.xtools.comparemerge.emf.delta.conflictstrategies

Description:

Implement this extension point to inject another conflict strategy if the default conflict analyzer doesn't provide the desired behaviour.

Configuration Markup:

<!ELEMENT extension (conflictstrategy+)>

<!ATTLIST extension

point CDATA #REQUIRED

id CDATA #IMPLIED

name CDATA #IMPLIED>

<!ELEMENT conflictstrategy EMPTY>

<!ATTLIST conflictstrategy

contentTypeId CDATA #REQUIRED

class CDATA #REQUIRED>

contentTypeId - the content type id e.g. "com.ibm.xtools.comparemerge.library.libraryContentType"
class - name of a class that implements com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictStrategy

Examples:

The following is an example of a compare/merge conflict strategy extension for emx,dnx,tpx and uml2 file extensions (extensions "emx,dnx,tpx,uml2"):


   <extension
         point="com.ibm.xtools.comparemerge.emf.delta.conflictstrategies">
      <conflictstrategy
            contentTypeId="com.ibm.xtools.comparemerge.ccdirectory.directoryContentType"
            class="com.ibm.xtools.comparemerge.ccdirectory.conflictanalyzer.NameConflictStrategy"/>
   </extension>

API Information:

The value of the class attribute must implement the interface com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictStrategy.

Supplied Implementation:

The compare/merge emf plugin implements default composite strategies.