Reply To: Automatic merging of xtUML data on the command line with Git

homepage Forums BridgePoint/xtUML Usage and Training Automatic merging of xtUML data on the command line with Git Reply To: Automatic merging of xtUML data on the command line with Git

#1260
Bob Mulvey
Keymaster

In #1 above, under “driver” in the “config” file, it reads:
driver = /eclipse/CLI.sh Merge -leftFile %A -rightFile %B -ancestorFile %O -outputFile %A

Note that you must put the path to you CLI.sh here. I suggest you simply put this next to the CLI.bat and Launch.bat files in your installation. If you do this, and you used the default installation path, and you are using Git Shell, then that setting will be:
/c/MentorGraphics/BridgePoint/eclipse/CLI.sh Merge -leftFile %A -rightFile %B -ancestorFile %O -outputFile %A