Vscode-extension-for-zowe: Resolve conflict compare button does not appear in Theia

[crawr]

The 'Compare' button does not appear when the safe save functionality is triggered. Instead, the data set is uploaded automatically and the mainframe contents are overwritten.

To reproduce:

1. Open a data set for edit locally using ZE
2. Edit the same data set outside ZE (e.g. in ISPF)
3. Edit the data set open locally and save the file.

The extension recognizes that there is a merge conflict and the warning is displayed but the button for compare is absent. The upload function is performed instead.

[Alexandru-Dumitru]

Opened this against Theia: https://github.com/eclipse-theia/theia/issues/7036

[jelaplan]

I have this same problem with VS Code. The message tells me to select 'compare' but I don't see anything to select. Apparently there should be a button to click.

[Alexandru-Dumitru]

Hi John. I know this appeared in VS Code as well. I am trying to fix it asap.
In VSCode it seems it's from the extension, but in Theia it's a bug on their side according to their investigation.

[zdmullen]

It appears that the issue for this in the Theia project has been resolved: https://github.com/eclipse-theia/theia/issues/7102

Furthermore, feat: Skip merge conflict resolution in Theia and provide meaningful overwrite resolution #708 was merged recently.

Can we check if this is indeed still an issue? If the messages and resolution on the Theia side are enough, can we close it?

[Alexandru-Dumitru]

I will have to re-test this. If they really fixed it, we would have to remove the workaround added in #708 and have the same behavior as in VSCode.

LE:
Tested on Theia v1.2.0-next.09d90c45:

• the editor now correctly detects if the file was modified on filesystem.

I suggest to keep this open, as it is also dependent on https://github.com/eclipse-theia/theia/issues/7036. Until they will provide a diff editor, we won't have the same UX as on VSCode, so it's better to have our users aware we cannot handle merge conflict resolution yet. (i.e. #708 stays in place for now)