Merge

Command with Output:

LemonTree.Automation.exe merge --mine={minePath} --theirs={theirsPath} --out={outPath} [-–base={basePath}] [--sfs] [--abortonconflict]

Command without Output:

LemonTree.Automation.exe merge --mine={minePath} --theirs={theirsPath} --dryrun [-–base={basePath}] [--sfs] [--abortonconflict]

Argument	Description	Required
--mine	The 'mine' version of the model, often called 'B'.	Yes
--theirs	The 'theirs' version of the model, often called 'A'.	Yes
--base	The common base version of the models. If omitted --base is set to --theirs.
--sfs	Save the session in a session file.
--out	The resulting 'Model', file will be overwritten if it exists.	Yes
--DryRun	Performs merge without actually writing a file. If --out is specified --dryrun is set to false.	Yes
--AbortOnConflict	Aborts merge if a conflict is detected.

Powershell Example:

This performs are three-way merge and saves the result as well as a session file.

C:\"Program Files"\LieberLieber\LemonTree.Automation\LemonTree.Automation.exe merge --base base.eapx --mine mine.eapx --theirs theirs.eapx --out out.eapx --sfs sessionfile.ltsfs
echo Exitcode $LASTEXITCODE
pause

The same as above but with the --DryRun option - perfect if you just want to inform users that their will be model level conflicts when the merge a feature back.

C:\"Program Files"\LieberLieber\LemonTree.Automation\LemonTree.Automation.exe merge --base base.eapx --mine mine.eapx --theirs theirs.eapx --DryRun--sfs sessionfile.ltsfs
echo Exitcode $LASTEXITCODE
pause