aghabeiki / gitdiffer Goto Github PK

Seems like the extension doesn't work when VSCode is working on a remote workspace.
It seems that the "param._resourceUri" is undefined and this causes the error.

Hi,
When working on a file in VSCode it would be very nice to open the diff tool on the current file without switching to the source control view.

Right-clicking on a staged file and picking "Launch Difftool for..." does nothing. Guessing this is because you need to specify --staged on the command line to git difftool in order to launch difftool for staged files.

Can a check be added to determine if the right-click is being done in the staged vs unstaged box and add the parameter as needed?

Hi,
After following the installation instructions, I right click on the file with conflict and select "Launch Difftool for.."
in the VSCode output I get :
"
fatal: Path 'file1.txt' is in the index, but not at stage 0.
Did you mean ':1:file1.txt'?
"
by the way, I'm using Meld instead of DiffMerge, so I made the proper changes to the git configs,
1.How can I be sure all these configs are working? write git mergetool in command prompt and it should open the defined meretool right ?
2.are those git config instructions works on Windows too ?

Thanks

It looks like the only way to run the merge tool is just to try and merge every conflicted file. I'd like an option to just merge the selected file. You can specify the file path on the git mergetool command: https://git-scm.com/docs/git-mergetool

Hello, thanks for this extension. One problem is that it doesn't work on files outside of the workspace.

For instance, if my Git repo has multiple packages in it like this:

• packages/
  • my-server/
  • my-frontend/

If I open packages/my-server/ with VS Code, the Git panel in VS Code will also show changes from the other folders in the Git repo. So, if I see a file from packages/my-frontend/, gitdiffer will not open them. It will only open files from the workspace folder, packages/my-server/...