Merge Conflict Resolver is missing

[maheshrajrp]

Hi All,
I'm trying to merge resolver working, I can see in Theia Cloud IDE Merge Conflict Resolver it is working. However, when it come to the local Theia, I'm unable to get it working. I compared both the package.json in browser, and plugins in Theia Blueprint and in my local one, still I'm unable to get it working.

It would be of great help if someone could help with the step involved in setting up Merge Conflict in Vanilla Theia locally.

Here's a picture of merge conflict resolver plugin that I trying to get working,

Thanks in advance

[msujew]

Hey @maheshrajrp,

are you using the @theia/git package in your app? The package is in the process of being deprecated (see #12745). The recommendation is to use the vscode.git extension.

[konstantin-tarasov-volantetech]

Right @theia/git is deprecated.

vscode extensions are also doesn't provide merge conflict resolver.

I've tried latest instruction locally and it comes without merge conflict resolver.

Running theia cloud, you can see the merge conflict resolver (looks exactly like on the screenshot above).

installing theia blueprint locally, it comes without merge conflict resolver.

So the question, how to make it works.

[msujew]

@JonasHelming Do you know which extension provides the merge conflict resolver?

[konstantin-tarasov-volantetech]

I guess, it is merge-conflict. But seems, it doesn't work as expected.

You can take a look to latest instruction and install the theia. It comes with vscode-builtin-extensions-pack (which includes merge-conflict). But doesn't provide the mentioned UI (on the screenshot).

[tsmaeder]

@konstantin-tarasov-volantetech I thknk we've got the culprit: the version of the built-ins you're using is 1.50.1. But if you look at the theia (or blueprint) package.json, the version there is 1.88.1. The version refers to the version of VS Code the built-ins come from, not the Thea release version.

[maheshrajrp]

Hi @tsmaeder ,

Thanks. I have another question, I remember using this Merge Conflict Resolver in Theia early days like v1.38, currently I'm working on project that uses v1.38 which is missing the merge conflict resolver. What would be your suggestion for that ?

Upgrading Theia is like longshot owing to React version upgrade and our current libraries doesn't support them.

[tsmaeder]

@maheshrajrp go back to 1.38 and check the version of the built-ins that were used at that time in the eclipse-theia/theia repo. But t.b.h, I would update to a newer version. And keep updating to every community release. It's easier to incrementally update than to fall back and then do a big update.
If you're looking for professional support with old versions of Theia, there are companies that offer such services like EclipseSource, TypeFox or my company Castle Ridge Software.

[JonasHelming]

@tsmaeder Could you retest this in your local IDE?

[tsmaeder]

Also see eclipse-theia/theia-website#587