Git User Group

cancel
Showing results for 
Search instead for 
Did you mean: 

Integrating LVCompare & LvMerge with TortoiseGit

Hi,

I am trying to integrate LvCompare & LvMerge with TortoiseGit. So far i have successfully integrated & tested the LvCompare by doing diff. But I am not sure how to use LvMerge. 

It would be really helpful if anyone can give me some clue about it.

Thanks 

0 Kudos
Message 1 of 3
(4,350 Views)

Late reply, but thats what worked for me:

 

Lichtenheld_0-1582271397620.png

 

 

Message 2 of 3
(3,910 Views)

For reference, there's an elaborate blog post on delacor.com talking about this:

http://delacor.com/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/




DSH Pragmatic Software Development Workshops (Fab, Steve, Brian and me)
Release Automation Tools for LabVIEW (CI/CD integration with LabVIEW)
HSE Discord Server (Discuss our free and commercial tools and services)
DQMH® (The Future of Team-Based LabVIEW Development)


Message 3 of 3
(3,886 Views)