If you'd like for us to help get your LabVIEW team set up with SourceTree, please let us know by contacting us. To solve this I manually configured Visual Diff Tool and Merge Tool (with as benefit that you can disable that annoying splash screen on launch everytime). Next, open the options for SourceTree, and go to Tools > Options:įor the diff command, change from "System Default" to custom and enter:Ĭ:/Users/User Name/AppData/Local/Programs/GIT/bin/_LVCompareWrapper.shĬ:/Users/User Name/AppData/Local/Programs/GIT/bin/_LVMergeWrapper.sh We don't formally test with Meld but trying it out now for diff and merge it seems to be working for me.
(Credit to Paul Lotz on Atlassian's forum, )įirst, download these scripts and place them in a local folder:įor this example, I'm assuming you'll put them in the folder:Ĭ:\Users\User Name\AppData\Local\Programs\GIT\bin\ We've had a couple of small hurdles getting SourceTree to integrate with the LabVIEW diff tool, but here's a solution that's worked for us.
Then on the 'General' tab, make sure to check the box to allow SourceTree to modify your Git config files.
SOURCETREE FOR MAC USING DIFFMERGE CODE
Our team is using BitBucket for source code control and the SourceTree app for Windows to interface with our repositories. From SourceTree, click on Tools->Options.
0 kommentar(er)
