![]() # Comment: Original way before three-way merge shown commented outĬmd = code -wait -merge $REMOTE $LOCAL $BASE $MERGED # Comment: This is to unlock Visual Studio Code as your Git diff and Git merge tool # Comment: You just added this via 'git config -global core.editor "code -wait"' Įmail = E:/src/gitlab/App-Custom/Some-App You will want to paste in the code in the "Extra Block" below. Run git config -global core.editor 'code -wait' from the command line.įrom here you can enter the command git config -global -e. git config -global 'code -wait -diff $LOCAL $REMOTE'.git config -global 'code -wait -merge $REMOTE $LOCAL $BASE $MERGED'.Thanks to Iztok Delfin and e4rache for helping clarify this.) To do this with command line entries, enter each of these: (Note: if on Windows Command Prompt replace ' with ". The way to wire them together is to modify your. Visuals and further explanations are available if that's of interest to you □.Īs of Visual Studio Code 1.13 Better Merge was integrated into Update: As of Visual Studio Code 1.70 Three-way merge with improvements were added.
0 Comments
Leave a Reply. |