![]() if you know those ways, go ahead and use them. gitconfig from the command line or by using SourceTree's UI. It is saved atĬmd = 'C:/Users/smercer/AppData/Local/Programs/GIT/bin/_LVMergeWrapper.sh' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"Ĭmd = 'C:/Users/smercer/AppData/Local/Programs/GIT/bin/_LVCompareWrapper.sh' \"$REMOTE\" \"$LOCAL\" We usedĬ : \Users\ > \AppData\Local\Programs\GIT\b in _LVCompareWrapper.sh _LVMergeWrapper.sh Save both of the attached files someplace permanent on your hard drive that is outside of any particular git repo. Yesterday, I and another developer outside NI worked through the sequence and got it working repeatably on both of our machines. Merge Tool: Custom Diff Command: C:\Program Files (x86)\Meld\Meld.exe Arguments: LOCAL BASE REMOTE -auto-merge -outputMERGED When I right-click on a conflicted file and select 'Resolve Conflicts' > 'Open External Merge Tool' I get the dialog for 'Visual Merge in Process' but the merge tool does not open. ![]() ![]() There are many links on the Internet to tell you how to configure git to use custom tools for VI.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |