User Tools

Site Tools


kb:bestpractices:scc:fork

Table of Contents

13 Fork Setup

Git Version

Fork ships its internal used git version. If you have installed a separate instance of git, make sure to have the same version installed to prevent confusion.

See this issue for more information about using only one instance.

You may want to use git update-git-for-windows.

LV Compare

To use LV Compare (only available in LabVIEW Professional Development System) in GitFork, adjust the following settings under File → Preferences → Integration → External Diff Tool:

 Diff Tool: Custom
 Diff Tool path: C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe
 Arguments: "$LOCAL" "$REMOTE" -nobdpos -nobdcosm

Beware: LVCompare.exe expects absolute paths and two files with different names!

GitK

Integrating gitk (The Git repository browser) into fork can be useful e.g. to check if a file has been modified on another branch to be aware of possible merge conflicts even before they arise. Execute a git fetch –all before, to see all changes.

Create a Custom Command (File → Preferences) with Target File Edit Path and Parameter to

 $sh
 "C:\Program Files\Git\mingw64\bin\gitk" --all "$filepath"

kb/bestpractices/scc/fork.txt · Last modified: 2022/07/10 13:28 by joerg.hampel