Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integrate with "Diff & Merge" #34

Closed
Zvika88 opened this issue May 30, 2020 · 2 comments · Fixed by #35
Closed

integrate with "Diff & Merge" #34

Zvika88 opened this issue May 30, 2020 · 2 comments · Fixed by #35
Assignees
Milestone

Comments

@Zvika88
Copy link

Zvika88 commented May 30, 2020

(From "Diff & Merge" but should be the visa-versa)

This is a great extension, but it only works on a single file. It would have been very useful if the feature could have been called from within a folder compare function such as the author's awesome Compare Folder extension, to allow integration of entire project trees without having to invoke the command over and over again (possibly hundreds of times...).

The reasonable use pattern would be to run Compare Folders, then go over the diffs, and have the diff-merge extension automatically available and operational within the extension's toolbar on every file being reviewed from the diff list.

@moshfeu moshfeu self-assigned this Jun 1, 2020
@moshfeu moshfeu transferred this issue from moshfeu/vscode-diff-merge Jun 1, 2020
@moshfeu moshfeu changed the title integrate with Compare Folders integrate with "DIff & Merge" Jun 1, 2020
@moshfeu moshfeu changed the title integrate with "DIff & Merge" integrate with "Diff & Merge" Jun 1, 2020
@moshfeu
Copy link
Owner

moshfeu commented Jun 1, 2020

I've started the implementation. Hopefully it will be in the next release (0.12.0).

Meanwhile, I'd be happy if you can test it. You can download it from here.

This option is off by default. In order to enable the integration, search for compareFolders.useDiffMerge in the settings page.

@moshfeu
Copy link
Owner

moshfeu commented Jun 4, 2020

@Zvika88 ☝️

@moshfeu moshfeu added this to the v0.12.0 milestone Jun 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants