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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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,559,995
Community Members
 
Community Events
185
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.

Regards,

Mike

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events