From Friday, April 19th (11:00 PM CDT) through Saturday, April 20th (2:00 PM CDT), 2024, ni.com will undergo system upgrades that may result in temporary service interruption.

We appreciate your patience as we improve our online experience.

Home Community User Groups Special Interest Groups Git User Group Forum Topic

Git User Group

cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 

Integrating LVCompare & LvMerge with TortoiseGit

Integrating LVCompare & LvMerge with TortoiseGit

‎12-20-2018 12:04 AM

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,070 Views)
Reply

Re: Integrating LVCompare & LvMerge with TortoiseGit

‎02-21-2020 01:50 AM

Late reply, but thats what worked for me:

 

Lichtenheld_0-1582271397620.png

 

 

Message 2 of 3
(3,630 Views)
Reply

Re: Integrating LVCompare & LvMerge with TortoiseGit

‎02-21-2020 07:11 AM

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,606 Views)
Reply