8 ms·
Did you know that VS Code added support for the same four-pane view as p4merge years ago? I used p4merge as my merge tool for a long time, but I switched to VS
by roryokane 6mo ago
Did you know that VS Code added support for the same four-pane view as p4merge years ago? I used p4merge as my merge tool for a long time, but I switched to VS Code when I discovered that, as VS Code’s syntax highlighting and text editing features are much better than p4merge’s.
I also use the merge tool of JetBrains IDEs such as IntelliJ IDEA (https://www.jetbrains.com/help/idea/resolve-conflicts.html#resolve-conflicts-productivity-tips https://www.jetbrains.com/help/idea/resolve-conflicts.html#r...) when working in those IDEs. It uses a three-pane view, not a four-pane view, but there is a menu that allows you to easily open a comparison between any two of the four versions of the file in a new window, so I find it similarly efficient.
- stbtrax 6mo agohow do you set that up? the default git tool version seems to be 3 pane
- ramchip 6mo agoLooks like it's "Show Base" under the top-level "..." menu when working on a merge conflict https://github.com/microsoft/vscode/issues/155277#issuecomment-1283623303 https://github.com/microsoft/vscode/issues/155277#issuecomme...