Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,362,968
Community Members
 
Community Events
168
Community Groups

Combining Source Tree and Tortoise Git

Hey everyone,

I'm wondering if there is / might be any problem with installing and using TortoiseGit and Source Tree at the same time. I like the interface of Source Tree very much, but I like the immediate feedback on the file icons from TortoiseGit.

I am hoping to combine those to, by just running them side by side.

Any experience if that might work?

Furthermore can I specify Diff and Merge for individual file types (in my case .vi from LabVIEW) like in TortoiseGit in Source Tree as well?

Thanks !!

Kind regards

Niels Göran

1 answer

To extend this question a little more...
I have a working Diff-Command for TortoiseGit (including the "-marks):

"C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %mine %base -nobdcosm -nobdpos

In my understanding I should be able to transfer this to external diff in Source Tree as such:

Diff Command: "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe"

Arguments: %LOCAL %BASE -nobdcosm -nobdpos

Unfortunately, this is not working with the following error from LabVIEW:

====

An error occurred while running LVCompare.

Open VI Reference in LVCompare.vi<APPEND>

VI Path: <b>C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\supportVIs\_prolvcmp.llb\%mine</b>

====

In my understanding this looks like an error while biulding the path in LabVIEW to be used to compare with the LVCompare.exe.

How is Source Tree appending those paths differently then TortoiseGit?

Thanks !

Kind regards

Niels Göran

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events