I'm seeing the same thing, and it appears to be something with the base JetBrains IDE as nothing has changed in that area in a LONG time, but they've been tinkering with external diff/merge quite a bit recently in the base IDE. I'll log a support case with them about it and we'll see if it is in fact the same as the one you linked or not.
Retrieve for Merge using External Diff tool no longer working
I suspect this is not IC2 issue, but when using the retrieve for merge option for the entire project, it no longer uses the external diff tool configured.
Possibly related to - https://youtrack.jetbrains.com/issue/IDEA-294650
This was working until I updated both WebStorm and IC2 over the weekend
WebStorm 2022.1.2
Build #WS-221.5787.30, built on June 1, 2022
Runtime version: 11.0.15+10-b2043.56 x86_64
VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o.
macOS 12.4
GC: G1 Young Generation, G1 Old Generation
Memory: 4096M
Cores: 12
Non-Bundled Plugins:
net.seesharpsoft.intellij.plugins.csv (2.18.2)
Key Promoter X (2022.2)
com.illuminatedcloud2.intellij (2.2.2.3)
CMD Support (1.0.5)
Official response
Comments (5)
-
repo owner -
reporter FYI as a work around there is a button on the internal diff to open in external diff tool
-
reporter Thanks @Scott Wells
-
repo owner - changed status to resolved
This is definitely a regression in the most recent IDE builds. I've filed the following issue with them here:
https://youtrack.jetbrains.com/issue/IDEA-295565
If they respond with a change/workaround that I should implement in IC2, I'll take care of it, but for now resolving this because it's an issue in the JetBrains IDE and not IC2 itself.
-
repo owner - changed component to Metadata Deployment/Retrieval/Removal
- Log in to comment
This is definitely a regression in the most recent IDE builds. I've filed the following issue with them here:
https://youtrack.jetbrains.com/issue/IDEA-295565
If they respond with a change/workaround that I should implement in IC2, I'll take care of it, but for now resolving this because it's an issue in the JetBrains IDE and not IC2 itself.