YAML editor breaks Git Merge Tool

[j-ulrich]

When I have the Yaml editor installed, the Git Merge Tool doesn't work for conflicting YAML files. Instead of seeing a comparison of the commits being merged, I just get a blank view:

=>

The normal compare view works although it doesn't do any YAML syntax highlighting.

I am using Yaml Editor version 1.6.2 with Eclipse IDE for C/C++ Developers version 2019-09 R (4.13.0).

[de-jcup]

Hello @j-ulrich ,

I tried to reproduce the problem:

• I created a testproject
• initialized a git repo
• created a yaml file
• committed the file to git
• changed something in file
• added to index
• doubleclicked on local version (as you described)

But it is working as expected:

For the test I used eclipse-2020-03 (Java IDE) at my Linux machine. At work I currently use 2019-09 (like you do) and had never such issues (also Linux). After I was not able to reproduce, I installed newest cpp eclipse package, installed yaml-editor by marketplace and tried out with cpp eclipse. Same result.

Now I installed cpp eclipse at a windows machine

so still there is all working - So I am not able to reproduce the problem.

[j-ulrich]

As I wrote: it was related to a merge conflict. The normal compare worked fine. However, I can't reproduce it now either. Also comparing conflicting changes works fine now. Maybe my Eclipse was in a weird state. Sorry for the trouble. ☹️