How to compare & merge

Hi all,

I’m currently looking for using the compare file functionnality and I’m surprisingly not found how can I merge the compared files. Usualy it’s possible in a compare view to move left or right, go to next diff etc.

How can I do that in Theia, this might be very useful if it’s not exist. Perhaps a vscode extension do that but I couldn’t found any in the OpenVsx registry. May be I’m not looking at the right place or in the right option in Theia?

Is someone can tell me some advices.

Regards

It’s not yet supported.

Hi thanks for your reply. My usage is out of GIT.

I might need something like that in the editor compare view : https://editor.mergely.com/. Is this you are talking too ?

@Al The only plugin I can find that looks similar to what you’re describing is this one: https://marketplace.visualstudio.com/items?itemName=moshfeu.diff-merge

You could download the VSIX and put it in your plugins folder.
Be careful, though, the author warns that it is still in very early stage of development.

Thanks, I try diff & merge, I plug it with success to theia (that was not so simple) via package.json which require a hosted .vsix into a HTTPS. But it’s ok.

As you say, it’s seems to be too early as the plugin actualy not working for me. I have the context menu but it open a blank page when I try to use it.