How to use Visual Studio Code as the default editor for Git MergeTool

Eric D. Johnson Published at Java

Eric D. Johnson

Today I was trying to use the git mergetool on the Windows command prompt and realized that it was defaulting to use Vim, which is cool, but I'd prefer VS Code.

How can I have Visual Studio Code function as my GUI for handling merge conflicts (or even as a diffing tool) for Git?

Eric D. Johnson

As of Visual Studio Code 1.13 Better Merge was integrated into the core of Visual Studio Code.

The way to wire them together is to modify your .gitconfig and you have two options.

To do this with command line entries, enter each of these: (Note: replace " with ' on Windows Git Bash, macOS and Linux as clarified by Iztok Delfin and e4rache)
1. git config --global merge.tool vscode
2. git config --global mergetool.vscode.cmd "code --wait $MERGED"
3. git config --global diff.tool vscode
4. git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE"

To do this by pasting some line in the .gitconfig with Visual Studio Code.

Run git config --global core.editor "code --wait" from the command line.

From here you can enter the command git config --global -e. You will want to paste in the code in the "Extra Block" below.

[user]
    name = EricDJohnson
    email = [email protected]
[gui]
    recentrepo = E:/src/gitlab/App-Custom/Some-App
# Comment: You just added this via 'git config --global core.editor "code --wait"'
[core]
    editor = code --wait
# Comment: Start of "Extra Block"
# Comment: This is to unlock Visual Studio Code as your Git diff and Git merge tool
[merge]
    tool = vscode
[mergetool "vscode"]
    cmd = code --wait $MERGED
[diff]
    tool = vscode
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE
# Comment: End of "Extra Block"

Now from within your Git directory with a conflict run git mergetool and, tada, you have Visual Studio Code helping you handle the merge conflict! (Just make sure to save your file before closing Visual Studio Code.)

For further reading on launching code from the command line, look in this documentation.

For more information in git mergetool check out this documentation.

Collected from the Internet

Please contact [email protected] to delete if infringement.

edited at2020-10-15

Comments

0 comments

From Java

Related Related

Article

How to use Visual Studio Code as the default editor for Git MergeTool

How to use Visual Studio Code as the default editor for Git MergeTool

How to use Visual Studio Code as Default Editor for Git

How Do I Setup Microsoft Visual Studio: Code as a Default Editor?

Setting Visual Studio Code as my Mac's default editor (including editing Git commits)

Windows 10 - How do I set Visual Studio Code as my default HTML editor?

How do I make Visual Studio Code default script editor in Unity3d?

Extend visual studio code editor

License for "Visual Studio Code" editor?

Visual Studio Code editor in Terminal

How to do git push in Visual Studio Code?

Error mergetool code compare in git

Which font is used in Visual Studio Code Editor and how to change fonts?

How to add a right margin to the Visual Studio Code editor?

How to google from the context menu of the Visual Studio 2015 code editor

How to use git mergetool with Cloud9 IDE?

How does Visual Studio choose which editor to use for a file?

How to use Visual Studio editor to replace and keep part of a string

Visual Studio 2013 editor default font size?

How to use Delve debugger in Visual Studio Code

How to use custom font in visual studio code

How to use custom font in visual studio code

How to edit default dark theme for Visual Studio Code?

What is the Visual Studio Code editor built on

How to use Edge as default browser with Visual Studio 2013?

Any way to use Visual Studio Code editor instead of nano/vim/emacs to edit files?

Any way to use Visual Studio Code editor instead of nano/vim/emacs to edit files?

How can I view the Git history in Visual Studio Code?

Visual Studio Code how to resolve merge conflicts with git?

How to git push to a different branch with Visual Studio Code?

How do I push a Git tag in Visual Studio Code?