youngmon/atlassian-qna huggingface dataset:
External merge tool can't open files with spaces in names
Asked by Teemu Mehti?:

Hello,

I'm having problems using external merge tool (TortoiseMerge) with files with spaces in the file names.

If there is a conflict in a file and I choose Resolve Conflicts -\> Launch External Merge Tool, the TortoiseMerge opens up but an error message comes up saying it can't find the file.

I have tried different options in Options -\> Diff:

* Using system default merge tool
* Selecting TortoiseMerge from the merge tool drop down
* Using custom with TortoiseMerge.exe in the command field and the file names in the arguments field with different quoting options, for example
  * -base:$BASE -mine:$LOCAL -theirs:$REMOTE -merged:$MERGED
  * -base:\\"$BASE\\" -mine:\\"$LOCAL\\" -theirs:\\"$REMOTE\\" -merged:\\"$MERGED\\"
  * -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"

All have resulted in the same end result: TortoiseMerge can't open the files.

Files without spaces in names open up correctly.

I'm using SourceTree 1.5.2 on Windows 7.

I use TortoiseMerge 1.8.3 as my external merge tool (system default).

Hope someone can help me with this.

Best regards,Teemu


Answers:
author: Peter Van de Voorde
body: Hi Teemu,

maybe this can help :

[](https://github.com/msysgit/msysgit/issues/57)<https://github.com/msysgit/msysgit/issues/57>

[](https://www.mail-archive.com/git@vger.kernel.org/msg17298.html)[https://www.mail-archive.com/git@vger.kernel.org/msg17298.html](https://www.mail-archive.com/git%40vger.kernel.org/msg17298.html)

This is not really an Atlassian related problem so you might find more help on stackoverflow or so.

Best regards,

Peter

comments: author: Teemu Mehti?
body: Thanks Peter,

Thanks for pointing me to the right direction.

Couldn't quite find the correct place to fix this with some quick searching the net. Easiest solution was to change the merge tool from TortoiseMerge to another tool.

Thanks for the help!

Teemu


author: Anton Zimin
body: The bug in mergetools is fixed already, but SourceTree 1.8.2.2 still does not work with TortoiseGitMerge correctly.


author: Maicon Saraiva
body: Hi, it's no necesary change another tool.  

After tests, i found the problem.  

The ":" used in params for open files in TortoiseGitMerge had a stranged bug.  

To solve, i set "Custom" in "Diff Toll" option at SourceTree, set the dir for TortoiseGitMerge and put this custom commands:

    -base \"$BASE\" -mine \"$LOCAL\" -theirs \"$REMOTE\" -merged \"$MERGED\"

TortoiseGitMerge run normally without ":"

The problem has solved. :)

comments: author: Owen Symes
body: Yes! This is exactly the answer I was looking for. Thanks [@Maicon Saraiva](/t5/user/viewprofilepage/user-id/1433057).


author: evankawa
body: Big thanks for this! Been fighting with this problem for months now and after trying different merge tools was still not satisfied. Stumbled across this thread and fixed in seconds. :)
What are the system requirements for installing sourcetree on windows 7 machine [ CPU, RAM etcc. ]
Asked by Rahul Mohan:

What are the system requirements for installing sourcetree on windows 7 machine \[ CPU, RAM etcc. \]

i do not find the data on any of the atlassian websites. please help me with a link where i can find this data..


Answers:
author: Umair Haroon
body: You can try emailing atlassian support on the ideal requirements if you havent got an answer elsewhere.

One thing that just occured to me, is that you can create a VM and configure the amount of RAM /CPU cores etc for it till the program performs well enough.

That would give you a good idea of what the specs need to be for the program to run well on your VM.

comments: author: Rahul Mohan
body: Yes i think i should email the attlassian support to get to know the sys requirements.. very much appreciate your response..


author: Rahul Mohan
body: accepted.. :)


author: Umair Haroon
body: @RahulYou can give it an upvote or mark it as accepted :D


author: Umair Haroon
body: awesome. Thanks:D


author: Seth
body: System requirements seem less necessary for a free, downloadable piece of software. Do you want to know if your system can handle it? Try it. If it has serious issues, uninstall it.

comments: author: Rahul Mohan
body: We are having 1000 licenses of STASH from attlassian and they recommended the tool sourcetree to be used . thats why we are using it..WE have been trying this out on our laptops and Virtual machines. Laptops work fine, but on VMS its very slow , close to unusable. So we are looking for the system requirements that Attlassian would suggest for this tool. Thanks for your advise. Any attlassian guys out here ??


author: Umair Haroon
body: Try downloading the program and going over the readme or the help section after installation.

comments: author: Rahul Mohan
body: NO , they do not have info on the system requirements for sourcetree on the tool's help page also. very strange..
So many checkboxes, so little time
Asked by Michael Bentley:

A recent update to SourceTree gave us a checkbox next to not just files to commit, but also next to globel effect entries like Staged files and Unstaged files. When you uncheck them entries appear to disappear. If you had the preference "confirm before adding/removing files" checked, SourceTree would pop a foreground alert asking if you meant what you just did, for each and every individual file. Normal OS X style Multiple select doesn't appear to work, so you can't select a bunch of files and then check one, you have to use the "Staged files" and "Unstaged Files" entries for that. And sometimes the app gets confused and loses some of the changes if you have the confirm option turned on; they come back when I disable the confirm option.  

What does this change improve? I see how clicking on the Unstaged files checkbox affects many files, but the relationships aren't immediately obvious and it took a bit of experimentation to figure out what you folks are doing. There's no horizontal differentiation between the Staged/Unstaged entries and the affected files; shouldn't the file entries, including checkboxes, at least be indented?


Answers:
author: Dave Coder
body: I loved the behavior of the checkboxes... you check a file in Unstaged, it moves to Staged. Then vice-versa. That made perfect sense. That's how I selected certain files to be staged or unstaged. The relationships were completely obvious because Unstaged was always on top of Staged, and I could see them move back and forth. Even if there's more files than would fit in each section, I could tell that the list changed. The number of files you've changed isn't SourceTree's issue, that's yours.

Now, I have to click to select each file, then hit the spacebar or click a button to move them... which is more steps and still removes them from one list and puts them on the other. For some reason this is only required on Windows; the Mac version has the checkboxes, which I used often.

I'm not understanding the complaint here or the change... the exact same thing happens when you stage/unstage, it's just more steps now. The checkboxes made things obvious and easier.


author: Jason Steenstra-Pickens
body: Had to up vote just for the title


author: Seth
body: See if [this blog post](http://blog.sourcetreeapp.com/2014/04/29/sourcetree-for-mac-1-9-out-now/) clarifies the behavior.


author: Michael Bentley
body: Is there a way to comment on how your software works without having to word it as a question?

comments: author: Seth
body: This isn't stack exchange, you probably won't have your post locked if it isn't a question.

On the other hand, most members of this site are Atlassian users - the devs are far too busy to read all of the questions. If you have a specific request for a change, you can post it at [jira.atlassian.com](http://jira.atlassian.com), or vote up an existing bug report/feature request if there is one already making the same point.
Sourcetree + minified files = SO SLOW
Asked by Sean Hill:

I've narrowed down the issue. If you have uncommited compressed / min files sourcetree bogs down so much. It just spins and spins. It took me about 10 minutes today to commit two files. THAT'S HORRIBLE! I believe it's an issue with whatever diff tool Sourcetree is using. Please fix this, I can't do anything with Sourcetree now.


Answers:
author: Seth
body: Try marking your minified CSS to not be diffed. See #1 here: <http://delvarworld.github.io/blog/2013/08/10/dealing-with-compiled-files-in-git/>

comments: author: ppittle
body: Link is dead


author: Ronald Chanou
body: I had this issue, and my solution was to mark the relevant file types as binary in the attributes file:

1. If it doesn't exist, create a .gitattributes file in the root of your project.
2. Add a line like "\*.min.js binary" (without quotes)...change it to match whatever files you don't want to diff.


author: KieranA
body: The problem is that Git is resource intensive when dealing with diffs like that and also takes a long time to respond. The Git process maxes out causing some general slowness.

The diff SourceTree uses is Git. We call Git and get diff output from it.

Cheers


author: Sean Hill
body: What do you recommend me doing then? I'd really like to continue to use SourceTree, but right now it's just not performing quick enough after this recent update.
SourceTree: Flat View and context menu Commit
Asked by Addy:

I just upgraded to 1.9.2, the first time I've upgraded SourceTree in a while. OMG. UGH!

First of all, "Flat View" is gone. This was pretty much by default view in the main window.. now? Gone!

Secondly, when I right-mouse click on a while in the last, the "Commit" option is GONE. All the other favorites are still there: Revert, Add, Log Selected (just listing the ones I use most) but my all time favorite: COMMIT has been removed?! (Yes, I know you can commit with the button at top and various other ways, but I often used the context menu and am a little confused as to why it's gone).

Why would you remove these things? I can't believe I'm the only user that misses them. :( :(


Answers:
author: Seth
body: @Mike Vargo: Instead of spamming your opinion on questions that are only read by other users, why don't you comment on and vote up the issues in jira.atlassian.com?


author: Mike Vargo
body: Please add flat view back


author: Seth
body: You aren't. There are many other questions on this site asking about those same issues (introduced in 1.9.0). The question below links to some specific bug reports regarding the issues you mention.

<https://answers.atlassian.com/questions/289308/how-do-i-get-the-file-tree-back>


Tags: mac
is it safe to remove untracked files from my branch
Asked by mallikarjun ithagoni:

if i remove untracked files then what happens ? is it safe to remove untracked files from my branch.

After commiting my changes , i want to create new branch but it is not allowing me to do.


Answers:
author: mallikarjun ithagoni
body: some times Source tree itself is adding changes so those files i want to delete.

finally i removed and working fine...

thank you all for answers.......

comments: author: Seth
body: The only files SourceTree adds should be Git configuration files (.gitignore, for example). You can remove that safely, but Git will no longer ignore whatever files you wanted to ignore.


author: Seth
body: Removing untracked files is deleting them, permanently. They do NOT get sent to trash/recycle bin, and (because they are untracked) sourcetree can not retrieve them by checking out the original branch or an earlier version.

comments: author: mallikarjun ithagoni
body: it means i should not do that or is it fine


author: Seth
body: It depends on what the files are and what you are trying to do. It depends on your definitions of "safe" and "fine". The shortest answer is this:

If you are 100% sure that you **never ever ever** want to have access to those untracked files, then you can remove them.
Unable to pull changes from remote repo (Working fine when using rebase)
Asked by Ruchi Sharma:

Hi,

I am facing issue while pulling remote changes everytime i click pull and see error 'false-fetch-origin' and 'false-pull-origin', but am able to pull changes if i use rebase.

![](../../upfiles/pullError.jpg)


Answers:
author: KieranA
body: Hey Ruchi,

Are you using system or embedded Git? Looking up this problem seems to indicate that it can call various scripts instead of Git itself if you're using a certain Git for Windows package.

Cheers
Clone a repository on Source Tree
Asked by Isuru Kodituwakku:

When I try to clone a repository from BitBucket and provide the Source Path/ URL the repository type is not recognized with a message 'This is not a valid source path/ URL'. I got the Source path/ URL from BIT bucket and I am able to see the same path by browsing hosted projects. Any ideas on what could be the issue? Thanks


Answers:
author: Ruchi Sharma
body: Make sure you have added relative SSH key to your BitBucket account.

To Add SSh key to your account Follow steps:

--\>Click User icon on top left.

--\> Click Manage

--\>click SSh key option and add public key.

Should work.

Also, use the same SSh key in Source Tree


author: Isuru Kodituwakku
body: When SourceTree started for the first time, I skipped setting up Git \& Mercurial in the wizard. Then I reran the wizard and chose to download and install the embedded packages.  
But it seems installing those didn't actually enable them - in the `Tools -> Options` dialogue they were both disabled!  
Enabling Mercurial (or Git in your case) allowed the clone dialogue to correctly identify the repo.
Notifications on branch checkout
Asked by Claudio Medina:

Hello,   

Since GIT doesn't support branch locking, we we're wondering if there was a way to setup email notifications or something similar when somebody checkout a brack? If not, any alternative you guys can recommend?


Answers:
author: Seth
body: Git and Mercurial are decentralized. This means that when a user clones a repository, he now has a copy of the repository that he owns. Branch locking makes no sense in these systems, because you (the locker) don't own the repository where you want branches to be locked, that user does.

You also can't set up triggers when a person checks out a branch, because they are checking out from that local repository that they own, not yours.

comments: author: Claudio Medina
body: I see what you mean, I totally overlooked that checking out ocurres locally. It would had been a nice addition though to avoid a lot of merging conflicts. Oh well, back to communication 101.


author: Seth
body: If somebody wants to work on a branch without interference, and you are using a central repository, that person just needs to avoid pushing their branch to that central repo.
Why are lightweight tags not recommended?
Asked by elmimmo:

The dialog to create a tag has, in the Advanced Options section, the option for the tag to be of the lightweight sort, but then it adds that it is "not recommended".

Is it not because SourceTree cannot reliably create them or is SourceTree being patronizing here? If the later, I do not consider that a proper place to suggest subjective good practices. And besides, why would they not be?


Answers:
author: Seth
body: It is generally accepted that it is best practice to avoid lightweight tags. I don't think SourceTree is being patronizing, I certainly didn't know the difference before you asked the question, I just took SourceTree at its word, and I think many other users will behave the same.

This [StackOverflow answer](http://stackoverflow.com/a/4971817) provides a good explanation of why annotated tags should always be used, even if the tagger doesn't have a comment to include.

comments: author: elmimmo
body: Thanks for the link and answers.

I still think the dialog is not a place to provide advice on good practices (however sound; otherwise, why only in that dialog?), and that the message is confusing as I originally thought that I had rather not add that sort **using SourceTree.**
Windows 7 sorcetree - Clone fatal Errors - Maybe git-submodule is broken?
Asked by informatics_studio:

I am really new to git and bitbucket. Installing SourceTree because I assumed it would help me figure git out. Unfortunatly I am stopped at the first stone. I run a clone off of my Bitbucket Private Repository to a local directory on my Windows 7 machine. When I run clone, select my source and destination. It gives me this fatal error:

fatal: 'submodule' appears to be a git command, but we were not  
able to execute it. Maybe git-submodule is broken?

I'm sorry for this question and it is probably something simple I need to fix configuration wise but I tried searching for an answer to no avail. Any help would be appreciated.

Thanks


Answers:
author: informatics_studio
body: Never Mind I figured it out. I had to use the embedded version of git. To do this start by going to Tools \> Options \> Git and clicking 'Update Embedded Git' to reinstall it. THe the button to the right click "Use Embedded Version Of GIt"
OSX Tree View
Asked by sMoZely:

Using sourcetree 1.9.0 on a Mac, I thought previously there was a tree view of files to make it easy to find one for doing a "Log Selected ..." on? has this been removed in 1.9?


Answers:
author: Seth
body: Duplicate: <https://answers.atlassian.com/questions/289308/how-do-i-get-the-file-tree-back/>
SoureTree 1.9.1 not refreshing
Asked by blader8901:

When making changes to the repo source tree is no longer auto-refreshing. re-running stree from the cmd has no effect. If I close the window and reopen via stree the repo is refreshed.

OSX 10.8.5


Answers:
author: HenriqueA
body: Hi Blader8901,  

I've found a bug report of a similar issue affecting the SourceTree **1.9.1** too, as you can see on the following link:

* [](https://jira.atlassian.com/browse/SRCTREE-2395)<https://jira.atlassian.com/browse/SRCTREE-2395>

It was reported on May/22/2014.  

Could you please try to update the **SourceTree** to the latest version and let me know if it still happening?  

Kind Regards,  
Henrique Lechner

comments: author: blader8901
body: Just installed 1.9.6 and it appears to be working now. Thanks!
How to search through commits?
Asked by Martijn Saly:

It must be possible to search through commits in sourcetree. I'm just trying to search in the commit messages, but searching for changed filenames would be cool to.

I can't find out how to do this...


Answers:
author: Pat Macpherson
body: To search through the commit messages, go to the "Search" tab (at the bottom of the page). This brings up the search view, with a search bar at top.

You can search on "Commit Messages", "File Changes" or "Authors".

comments: author: Martijn Saly
body: Excellent! I must say I've never noticed those tabs...I guess I sort of knew they were there, but I never gave them any thought. To search, I normally try Ctrl+F or F3, and if that doesn't do anything, I start looking through the Edit menus, and then other menus if I still can't find it.

So I do like to make a friendly suggestion: Ctrl+F to activate the Search tab and focus the search field. And an entry in the Edit menu.


author: Seth
body: Add a feature request at [jira.atlassian.com](http://jira.atlassian.com)


author: Pat Macpherson
body: Martin - I didn't notice them either! Like you, I checked the menu, and also various right-click context menus. It is already in the menu under "View".

I've created a feature request-

<https://jira.atlassian.com/browse/SRCTREEWIN-1788>


author: suresh chittibabu
body: Go to the search menu located on the left side of Sourcetree panel. Then enter the search key and filter based on the user , commit etc.
How do I set the author name on commits?
Asked by Rich Mayfield:

Prior to Sourcetree 1.9 it was easy to set the author name on commits. I needed to do this when I checked something in on behalf of another user. I only see the ability now to specify the commit message.

How do I set the author name now?


Answers:
author: Jeff Thomas
body: Hi Rich,

Clicking on the avatar next to the commit user will open up the author pane and allow you to customize the commit author being used. See the screenshot below for an example.

![](../../../upfiles/Screen_Shot_2014-05-27_at_5.41.13_PM.png)

Cheers,

Jeff
Error in PowerBi Connector and TiS
Asked by Matias Vizzari:

Good morning,  
I'm having problems importing TiS into Power BI, this was working correctly a few days ago, but currently when I connect with Power BI Connector the table arrives empty, I started working with TiS about a month ago.  
Since I appeared to update the TiS App, the TimeInStatuses table is loading empty, as if the connection between the TiS and PowerBi Connector was not working, the token is loaded correctly in the PowerBi Connector, I don't know if I have to do something additional later of the last update.

I wanted to try adding a new token in case it was a problem with the update but when trying to configure a new token it gives me an error when trying to update, but it tells me that there is already a token, so it still recognizes the previous token.

I await news, thank you very much in advance,  
greetings.

![Add Time In Status token.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/267813i3CD37E6768DAA9B3/image-size/large?v=v2&px=999 "Add Time In Status token.PNG")![API Setting.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/267814i82EE2A8842E083CC/image-size/large?v=v2&px=999 "API Setting.PNG")![dashboard in Jira Cloun.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/267816i2C72A0E5BD09BA35/image-size/large?v=v2&px=999 "dashboard in Jira Cloun.PNG")![Power Bi Query editor.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/267815iB2CDE8A1A33E8294/image-size/large?v=v2&px=999 "Power Bi Query editor.PNG")


Answers:
author: Liubov Topchyi
body: Hello Matias [@Matias Vizzari](/t5/user/viewprofilepage/user-id/5264423) ,

Thank you for contacting our [support team](https://aserve.atlassian.net/servicedesk/customer/portal/16) with this request. We are happy to know that the issue was resolved.

We strongly advise reaching out to our dedicated [support team](https://aserve.atlassian.net/servicedesk/customer/portal/16) for any issues you encounter with the app, rather than seeking help from the community. Our [Help Desk](https://aserve.atlassian.net/servicedesk/customer/portal/16) is the most reliable and efficient option to receive prompt support, in line with our Service Level Agreements (SLAs). Our support team is fully committed to assisting you and ensuring a timely resolution to any challenges you may encounter.

Regards,

Luba

comments: author: Matias Vizzari
body: Hello, thank you very much for the answer, yes I already contacted support a few days ago and it was an internal error due to changes in the API.  
Greetings!


Tags: cloud

confluence-cloud