vscode-as-git-mergetool
vscode-as-git-mergetool copied to clipboard
zawys
VS Code extension providing diff editor layouts & more for 3-way merging
## Steps to reproduce 1. need to merge conflicts 2. open resolve panel 3. there is no checkbox for merge on the left ## Expected behavior normal show checkbox when...
## Steps to reproduce 1. Have a folder with more than one repo inside, e.g. this structure: ./workspace ./workspace/repo1 ./workspace/repo2 2. Open vscode on the base folder (code ./workspace) 3....
## Steps to reproduce 1. Install extension from Marketplace 2. Execute "start Git mergetool" 3. Open view merge, but not the layout 4-ways or 3-ways ## Expected behavior Open the...
Hi there, I've been researching command line tools to replace my kdiff3 usage. I use SVN and in my org we do three way merging very often. In SVN, we...
Hi! I'm a VS Code-OSS user, a FLOSS version of VS Code, it's the same code but without the Microsoft's telemetry and branding. I want to request if it's possible...
## Steps to reproduce 1. Install git mergetool 2. Click start git mergetool from the git panel 3. 4. ## Expected behavior Open merge tool without error message ## [Optional]...
## Steps to reproduce Tried in both node 14.18.1 and 16.13.0; seem to get similar results. I disabled `$.scripts['lint']` in `packages.json`, since that seems to have its own issues (typically,...
Resolves #10 Makes `yarn build` pass; haven't checked if extension is OK
## Steps to reproduce ``` $ cd vscode-as-git-mergetool $ git log -n 1 --oneline --no-decorate de60bc0 update dependencies $ node --version v16.13.0 $ yarn --version 1.22.17 $ yarn # Nothing...
## Which problem is your feature request related to, if any? Layouts ## Solution you'd like An extra layout option, if possible; similar to `3DiffTo*` flavors, but only show diff...