Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,824 views 4 13
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you