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
Community Members
Community Events
Community Groups

Sourcetree and Labview merge, error in creating local and base files

Hi All,

I am note sure if it is 100% Sourcetree doing this, but when I use Sourcetree with Labview's LVMerge tool, I notice that something is creating 4 files, Back, Base, Local, and Remote. However, LVMerge sometimes crashes or hangs because some of mentioned files won't get created correctly.

createdfiles.pngHere are the files created, and you can see it in Sourcetree since they get created in the same directory.

nosize.pngAs you can see, the BASE and LOCAL copies are both 0KB as they don't get generated correctly.

Has anyone using Sourcetree with Labview seen this problem before? I honestly don't think the LVMerge tool is doing anything to generate these files since I have used it before directly without going through command line or a 3rd party tool. All the GUI LVMerge tool does is take path information from BASE, LOCAL, and REMOTE VIs and starts the merging process.



0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

78,701 views 134 29
Read article

Atlassian Community Events