Hi,
What is the preferred way to handle merge conflicts when using git in combination with Capella?
As far as I can tell, EMFCompare is started when I start the merge tool to resolve any merge conflicts. However, inside Capella, modifications are often processed by EMFDiffMerge. EMFDiffMerge is also used/mentioned in Capella’s help.
I don’t manage to select the EMF Diff/Merge viewer when comparing two version of an .aird or .capella file as shown in the help topic: Capella guide / User Manual / Version Control with GIT / Capella GIT integration.
Regards,
Wilbert.