LemonTree can be seamlessly integrated into existing versioning systems, such as Subversion, Git or PTC. This enables the centrally and automatic management of model versions. It also enables parallel editing of models in a team, as has for years been a common approach when editing source code. LemonTree for Enterprise Architect is referred to as a Diff & Merge Tool for VCSs as soon as a model is checked into the central repository.
Command Line Options
LemonTree.exe --merge=auto --base="C:\tmp\xx0.eap" --mine="C:\tmp\xx1.eap" --theirs="C:\tmp\xx2.eap" --out="C:\tmp\merged.eap"
Explanation: Attempts to merge xx1.eap with xx2.eap, writing the output to merged.eap. Opens interactive mode if there are conflicts.
LemonTree.exe --diff --base="C:\tmp\xx0.eap" --mine="C:\tmp\xx1.eap" --theirs="C:\tmp\xx2.eap"
Explanation: Does a three-way compare of xx0.eap, xx1.eap and xx2.eap.
LemonTree.exe --diff --mine="C:\tmp\xx1.eap" --theirs="C:\tmp\xx2.eap"
Explanation: Does a two-way compare of xx1.eap and xx2.eap. Note that 'base' is set to the same model als 'theirs'.
Using LemonTree with SVN
If you have already installed TortoiseSVN, the corresponding configurations are automatically added when installing LemonTree.
Using LemonTree with Git
If you have already installed TortoiseGit, the corresponding hooks are automatically added when installing LemonTree.
If you want to configure LemonTree as external diff & merge tool please click here.
The following exit codes are provided by Lemon Tree:
Parsing error of comand line parameter
Reading/interpreting error of config file
Diff or premerge error (GUI is not opened, because there's nothing to show)
GUI has been opened (because of conflicting changes) but closed without merging
|6||No valid license found (new since version 1.7.0)|