How can I see 'git diff' on the Visual Studio Code side-by-side file?
In Visual Studio Code, on the left side, there is a Git icon that looks like this:
By clicking on this icon, then double-clicking one of the files listed under Changes you can see the Git difference in two sides.
If you want to see the diff changes from different branches, there is some extra work. For example you want to see all the changes from last N commits in your Feature branch.
Set up Visual Studio Code to be your default difftool by adding this in your ~/.gitconfig file.
[diff] tool = vscode[difftool "vscode"] cmd = code --wait --diff $LOCAL $REMOTEGo to your Git project. Type in:
git difftool {{branch you want to check with}}, for example git difftool master
You will be prompted for each file, if you want to open it in Visual Studio Code or not.
You can achieve this in Visual Studio Code by
- Opening up settings (On window/linux File > Preferences > Setting. On macOS Code > Preferences > Settings)
- Search for diff
- The specific setting is Diff Editor:Render Side by Side. Mark the checkbox.