Table of Contents Previous Next Index

CHAPTER 1 Introduction : Merge Tools

Merge Tools

When you run the project.migratefiles target, the SDK attempts to merge files using a merge tool. The merge tool that is used is configurable: its use is specified using the following properties in the my_sdk.properties file:

automerge.nonconflicting.files=true: selects or deselects the auto-merge of non-conflicting changes

mergetool.name=diff3: sets the merge tool to be used in the merge process

The merge tools are installed in sdk_home/sdktools/mergetools/. Each merge tool is installed in its own directory, and a wrapper is provided to call the merge tool. The file handler.xml is the wrapper: two wrappers are provided, one for sibermerge and the other for diff3 (which is freely distributed with the SDK). The directory name where the merge tool is installed must be the one used for the mergetool.name property value.

diff3

Make sure that the location of the diff3 executable is specified using the diff3.executable property.

sibermerge

Make sure that the JAR file containing the Java form of the sibermerge application is copied to the specified directory: sdk_home/plugins/mergetools/sibermerge/ and make sure that the license key file is in the same directory.