Is there a way to apply the difference from one file to the other?

ryu1kn / vscode-partial-diff

Visual Studio Code Extension. Take a diff of 2 parts of text(s)

https://marketplace.visualstudio.com/items?itemName=ryu1kn.partial-diff

MIT License

184 stars 15 forks source link

Is there a way to apply the difference from one file to the other? #45

Open tschofen opened 4 years ago

tschofen commented 4 years ago

Being able to compare a file against the clipboard is a life saver. However, I can't figure out if there's a command to apply the selected difference from one side to the other. Like the conflict resolution in git.

ryu1kn commented 4 years ago

Hi @tschofen sounds good, though I'm not sure if the diff view allows us to apply changes from one side to another with just a mouse-click

Terve16 commented 2 years ago

In GitLens you can merge with arrow buttons, next to the line index. That is really convenient. It would be a great feature, if this extension would allow it too.