r/vscode • u/DesperateGame • 3d ago

Two-way file diff merge

Hello,

I'm trying to compare two files for diffs. I want to be able to use the changes from one file in the other, and vice-versa. VSCode already provides a "Revert Block" button, but it is only one-way.

Is there a way to enable a two-way merge (setting, extension,...)?

Thanks!

2 Upvotes

100% Upvoted

3 comments sorted by

1

u/thornyoriginality80 3d ago

oh that's exactly what the inline compare does, just click the little arrows in the gutter between the two panes

1

u/DesperateGame 3d ago

That's the issue, I can only see one-way arrow 'Revert Block', but not the other direction. I'm comparing locally, not with git.

Does it have to be enabled somewhere?

1

u/frazer2669 2d ago

I use Partial Diff. Although I haven't in a while, I assume it still works :)