youngmon/atlassian-qna huggingface dataset:
Can I use the same free license at home and at work?
Asked by Asselberghs:

Hello Atlassian.  

I have been using Bitbucket and Sourcetree for a long time now, I really like your service and having a backup and revisions so I can see what I have done and better manage my code is brillaint, it makes coding so much easier when tracking down errors and revert to something that worked.  
As such I don t want trouble I want to be able to continue using it.  
I am sitting at work working on my repositories from time to time when I get ideas, I downloaded Sourcetree and it says please register.  
Now my question is, can I take my home license and use it here at work? or must and can I? register another free license for my work machine? mind you, I am not using it for work in any business capacity, they have their own system, it s only for pulling and pushing files when I get ideas for my own projects while I am at work.  
Hope you can help.  

Kind Regards  

Nick Asselberghs


Answers:
author: Seth
body: SourceTree's license is free for any type of usage. You can use the same license in both locations, or you can obtain a separate license. Neither way will violate the terms of the license.

<http://sourcetreeapp.com/faq/>
SourceTree without .Net 4.5
Asked by Rotem Dvir:

Hi,

Is there a version for Windows of SourceTree where it is not mandatory to install .Net 4.5?

I can't install it on my machine.

Thanks,

Rotem


Answers:
author: AafrinA
body: Hi Rotem,  

The .net 4.5 framework is required to install the Source Tree in Windows based machine. Refer to the following [FAQ](http://www.sourcetreeapp.com/faq/) on Source Tree

comments: author: Eric Anderson
body: The FAQ page link you provided does not work. Has the FAQ page been abandoned (which would be a loss) or simply moved to some other URL?

404 {#toc-hId-1848919826}
-------------------------

Sorry, the page you're looking for cannot be found


author: safi.bikdash
body: Is the Page moved to another URL?   


author: Eric Anderson
body: Sad to say, but more than 4.5 years after I pointed out that the FAQ page is missing, it is still missing. I haven't been able to find any such FAQ page.

The **Sourcetree App** website is still there.  
<https://www.sourcetreeapp.com/>

Atlassian does have **getting-started** documentation for Sourcetree.  
<https://confluence.atlassian.com/get-started-with-sourcetree>

That includes instructions to "[**Install and set up Sourcetree**](https://confluence.atlassian.com/get-started-with-sourcetree/install-and-set-up-sourcetree-847359043.html)".

There is also a [**Sourcetree Knowledge Base**](https://confluence.atlassian.com/sourcetreekb/sourcetree-knowledge-base-265901498.html) that can be searched (though at this time it is not clear that there are any up-to-date pages in it discussing .NET dependencies).

But the FAQ page is just gone.
sourcetree?svn? how to commit a file file or specified files
Asked by ye liu:

how can I commit a file or specified files with svn in the sourcetree.

help.

thanks


Answers:
author: ye liu
body: hi!

I hava a try, but I don\`t know how to commit single file or selected files.

![](https://answers.atlassian.com/upfiles/QQ20140616-2@2x_1.png)

when I want to commit selected files, selected "Push changes immediately to Subversion", but then "Push failed"

------------------------------------------------------------------------------------------------

```
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree commit -q -F /var/folders/k6/4jy8yfxn2f71lc09kk7vh29r0000gn/T/SourceTreeTemp.clNYqr -- u77/xxxxxxxxxxxx/View/Dashboard/index.tpl.php git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree svn rebase update-index --refresh: command returned error: 1u77/xxxxxxxxxx/View/Dashboard/login.tpl.php: needs updateCompleted with errors, see above
```

```

```

```
------------------------------------------------------------------------------------------------
```


author: HenriqueA
body: Hi Ye,  

You can enter any valid Subversion URL in the clone box, in order to clone a Git/Mercurial repository from SVN and interoperate with the SVN server over time if you want. You can't, however, add a SVN checkout.  

Kind Regards,  
Henrique Lechner

comments: author: ye liu
body: hello, can you help me?

<https://answers.atlassian.com/questions/305636/sourcetree-svn-how-to-commit-a-file-file-or-specified-files>


Tags: community
How can I find all versions of a file on some branch
Asked by David Jameson:

I'm working on one branch and there's a particular file on another branch that I'd like to pull in but I can't easily find the LATEST version of that file. I can sometimes find SOME version of it and when I do that and right-click to log, I see the history of that file up to the commit where I found it but that doesn't tell me if there's a newer commit of that file.

The "Find" mechanism doesn't seem to have a way to find an actual file by its name. It only seems to let you search by commit message, SHA and other such things.

What am I missing?


Answers:
author: Bal?zs Szakm?ry
body: First select the latest commit in the top part, then switch to the File Status tab (bottom, middle), then on the top, change "Show Pending" to "Show All". This gives you the list of the current files. Right clicking here and selecting log/blame will give you history up to the last state.

comments: author: David Jameson
body: Duh. I keep forgetting about "show all" as a view. Of course that will work. Thank you.


author: David Jameson
body: This only works on current checked out branch. I need to be able to find a file that is in a different branch without checking that other branch out.


author: Bal?zs Szakm?ry
body: As far as I know, this above is the closest you can get with SourceTree. You will see everything that happened in branches merged to master (or the one you are looking at), but not stuff that happened in "parallel" branches.


author: David Jameson
body: Feature request?


author: Seth
body: As far as I know, you've got three options for getting a file from one branch to another.

1) Merge the branches. This will merge all files, so it probably isn't what you want.

2) Cherry pick. This would need to be done for each and every commit that has effected the file in question, which is likely to be tedious.

3) Checkout the other branch, copy the file in question somewhere (will be the latest copy from that branch), checkout your original branch, and copy the file back in (overwrite what is there). Then commit.

comments: author: David Jameson
body: The command line option

git log --all -- somefile

does it.

There should be a SourceTree equivalent
SourceTree Password Problem
Asked by Mike Koenig:

On a Mac I installed sourcetree and connected to a git repository. I can submit, push and pull just fine but every time it prompts me for my password. the git repository happens to be visual studio online. After I type my password the transaction happens just fine.

I can't find a setting to have it save my password informaiton so I do not have to type it in each time.

Exactly where in the mac client for sourcetree can I set the password?


Answers:
author: Bal?zs Szakm?ry
body: I use windows, but I guess it is tin the same place on Mac too: Tools/Options/Authentication gives you a list of user/host/password trios. It probably asks repeatedly because a wrong password is stored.

comments: author: Mike Koenig
body: Sorry, but on the mac does not have that setting. Can anyone who has the mac version help out? Everything is working fine for our windows installations, but it has the problem on all of our mac versions.


author: Seth
body: SourceTree for Mac should be trying to store passwords in the keychain. There have been other users who reported this in the past. Search this site for them.


Tags: password
Performance issues
Asked by nathaniel_stevens:

I have installed Sourcetree on a new machine and am finding it to run unbearably slow. It seems to be an issue with Sourcetree itself as operations such a commits run quickly. It is the loading/refreshing of windows (including simple operations such as opening the options menu) which take a long while before completion. I'm including the recommended information to help with diagnosis. Please let me know if there's anymore information I can provide.

**Information to provide to support**

1. Whether it's for Git/Hg and which version (embedded, system, and what system version if system)
   1. I have tried using both the embedded Hg and TortoiseHg. There is no difference between the two
2. System resources, CPU/RAM/HDD capacity (+ available hard disk space)
   1. CPU AMD Athlon II X4 630 2.80 GHz
   2. 6 GB RAM
   3. 1 TB HDD (586 GB free)
3. Where your repository is located, i.e. locally, on a mounted volume or over a network (SMB share etc.)
   1. Local
4. How many repositories you have in SourceTree
   1. 1
5. How many repository windows you have open at one time
   1. 1
6. The version of SourceTree you're using
   1. 1.5.2
7. Operating system version.
   1. Windows 7
8. The file filters you're using in SourceTree, i.e. 'Show Untracked'
   1. I've tried them all with no difference. I've tested using a repository consisting of only one small text file which runs almost as slow as larger repositories
9. If you have a lot of untracked files, please make a note of this also
   1. no
10. Can you run 'git status' on that repository?
    1. I'm not sure how to do that
11. Log files located in:
    1. Windows: C:\\Users\\\<username\>\\AppData\\Local\\Atlassian\\SourceTree\\sourcetree.log
    2. I don't seem to have a file that fits this description


Answers:
author: nathaniel_stevens
body: It was Spybot running in the background.

comments: author: Seth
body: Thanks for the detailed question and sharing your solution!


Tags: performance

windows
How to achieve this in Source Tree, Was able to perform this steps from Terminal but need to know how to do it from UI?
Asked by SAMEER AHMED:

### **How to achieve this in Source Tree, Was able to perform this steps from Terminal but need to know how to do it from UI?** {#toc-hId-1454712034}

<br />

### Merge conflict {#toc-hId--1097444927}

This pull request has conflicts. You must resolve the conflicts before you can merge:

**Step 1:** Fetch the changes (saving the target branch as FETCH_HEAD).  

    git fetch origin Branch1 

**Step 2:** Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.  

    git checkout Reverting git merge FETCH_HEAD

**Step 3:** After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.  

    git commit git push origin HEAD

**Step 4:** Merge the updated pull request.


Answers:
author: Dan Pidcock
body: I was able to do the following:

Step 1.

In SourceTree click Fetch

Step 2.

Checkout the source branch in the branch browser

Click merge and choose Branch1 to merge from (called the target branch above)

Step 3.

Commit

Push

Step 4.

Merge in Stash
Can't open or clone new repository
Asked by Eric McDonald:

Hi there,

I'm brand spankin new to Source Tree and having some difficulty getting it up and running. I've installed the latest version of Source Tree and I'm currently running OSX 10.7.4.

When I installed Source Tree a window popped up at the very end telling me to change my $path variable to usr/bin/something (my apologies but I was with a friend that had installed it before and he said don't worry about it, then closed the window so I don't remember what the rest of the path was).

Now when I open Source Tree and try to open a repo nothing happens. No errors, no hanging or computer locking up, just nothing. It's as if I didn't have the software on my computer at all.

I know it's a vague question but could someone help me out please? I've looked all over online and can't find a solution.

Thank you in advance.


Answers:
author: HenriqueA
body: Hi Eric,

It seems a recently issue on the newer version of SourceTree for MAC OS X reported by some users.

The solution to this issue at this moment is to use the version 1.9.3 until the bug get fixed.

To help you I'm sharing here the link to SourceTree 1.9.3 from the official Atlassian website:

[](http://downloads.atlassian.com/software/sourcetree/SourceTree_1.9.3.dmg)<http://downloads.atlassian.com/software/sourcetree/SourceTree_1.9.3.dmg>

It's possible also check the bug report through the following link:

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

I suggest you to vote on this bug and add yourself as watcher then you can be notified when it gets updated. :)

Kind Regards,

Henrique Lechner

comments: author: Eric McDonald
body: Thank you Henrique and sorry for my delayed response. I managed to get things up and running on my Windows machine and forgot to get back to you.

Cheers.


Tags: install
sourcetree 1.9.4 preferences for Mac OS Mavericks
Asked by wkinjp:

Once opened the preference window cannot be closed anymore (i.e. clicking the red button in the upper left corner has no effect) and it appears the settings are not saved, even after restart.

For example I changed the language settings from Japanese to English, but everything remains in Japanese after a restart of sourcetree although the language setting in the Preference window displays "English".

Any help appreciated.


Answers:
author: wkinjp
body: Hi Henrique,

Many thanks for your help. Actually, the version I had installed yesterday was 1.9.4.1.

But currently I am using 1.9.3 and everything works fine so far. I can close the Preference window and I can change the language settings.

Hopefully, everything will be back to normal in a future version (maybe already 1.9.4.2)

Regards,

wk


author: Hanxue Lee
body: Another confirmation, Preferences window for SourceTree 1.9.4.1 does not close in Mavericks 10.9.4


author: derio
body: I can confirm that the Preferences window does not close in 1.9.4.1 in Mavericks


author: HenriqueA
body: Hi wkinjp,

Please update your **SourceTree** to 1.9.4.1 version, it fix important bugs of 1.9.4 version including some trouble to close/open some windows on it.

There is also an bug report of the version 1.9.4 that is fixed on the new 1.9.4.1:

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

Kind Regards,  
Henrique Lechner
Issues with Mac OS X 10.7.5
Asked by Melody Tan:

Hi,

I just downloaded and installed the SourceTree app version 1.9.4. However, the interface doesn't seem to open/run. Nothing comes up. I have tried re-downloading and re-installing about 5 times already.

Please help.

Thanks.


Answers:
author: Melody Tan
body: Solved at <https://jira.atlassian.com/browse/SRCTREE-2470>


author: ComicSans
body: Try to open console.app from applications/utilities and look for error or warning messages.

comments: author: Andru Dunn
body: I've had the same problem and can't see anything showing as an error in console
Why is Source Tree re-prompting for passphrase after rebooting computer
Asked by Eric Labashosky:

After rebooting, Source Tree prompts me for my passphrase.

How can I tell Source Tree to remember my pass pharse for SSH?


Answers:
author: Cristian
body: Having to enter the passphrase after each computer restart is rather annoying.

I'm also on Windows 10. Has anyone found a solution?


author: Eric Labashosky
body: Windows


author: Seth
body: Windows or OSX?
How can I search for a certain commit based on message?
Asked by Torleif Berger:

This is a bit ridiculous, but I can't seem to find *any* way of search for a certain commit in my history based on the commit message. I know I did something in the past, and I need to know what it was. I know some of the contents of the commit message, so figured it should be easy to find with a tool like Atlassian SourceTree, but... is there really no search in this tool?


Answers:
author: Seth
body: In SourceTree for Windows, there is a search tab at the bottom of the page (File Status, Log / History, Search). Beside the search box is a dropdown to change whether you search by Commit Messages, File Changes, or Author.

comments: author: Torleif Berger
body: Oh, all the way down there. Hadn't even noticed those tabs were there O.o

Thanks!


author: Robert Chapman
body: OMG, there is now also a Mac search! I had given up and then I found it on the left under the WORKSPACE thingy. Thanks.


author: Brandon Perry
body: For more-recent builds it's in the left bar, not actually included in the History view (Sourcetree 3.3.4):

![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/95320i2B1943CA599E1531/image-size/large?v=v2&px=999 "image.png")


author: edward71
body: I can't believe i missed that in the left-hand side.


author: Vlad
body: Quick-fire Search with Ctrl+3
How can I Make Use of Custom Scheme for URI Links?
Asked by moritz_david:

I am very impressed by Sourcetree's ability to seemingly create its own custom URI scheme of "sourcetree://clonerepo..." and I was wondering if there was a way for me to make use of that feature in my own applications.

I recreated the link in both Firefox and Chrome and realized that there was no javascript used to cause a local instance of Sourcetree to open. However, when I tried to make my own scheme, it, naturally, was unrecognized. This led me to believe that during the installation of Sourcetree, there must have been some method that added the "sourcetree://" scheme to a whitelist of sorts in Chrome and Firefox to allow it to function as it does.

If anyone could point me in the right direction on this, I will be very grateful!

Thanks!


Answers:
author: Timothy
body: By right, one would be creating a custom uri for an application ([http://msdn.microsoft.com/en-us/library/ie/aa767914(v=vs.85).aspx](http://msdn.microsoft.com/en-us/library/ie/aa767914%28v=vs.85%29.aspx)) as defined here. As long as the client has this in it's registry (e.g. HKEY_CLASSES_ROOT\\sourcetree\\shell\\open\\command), the client machine should recognize "sourcetree://".

Not sure what you are trying to do.

comments: author: moritz_david
body: This is perfect! Thank you very much! It was very rewarding to be able to create my own scheme.
Repository commingling with two remote repos on different hosts
Asked by Charlotte Manning:

I recently created a new repository on bitbucket with conventional naming scheme of 'origin' and added it to Sourcetree in the Bookmarks window. Now an existing repository (also named origin) that I have been editing with sourcetree (hosted on github) appears to think it is pointing to this new repo. If I view the Hosted Repositories window, these two repositories show the correct hosts. I can't figure out how to view the remote url setting (which I suspect may be the issue) within Sourcetree. I believe I have mixed hosts (beanstalk) in the past without issue.


Answers:
author: Charlotte Manning
body: .git/config file from existing repository was somehow modified during setup of 2nd repository on different host. See above steps to repair.


author: Charlotte Manning
body: thanks!


author: Seth
body: Now that you've fixed the old repo's config file, run a "fetch" command to fix your issue with git status.


author: Charlotte Manning
body: 1) Git \& OSX 10.8.5 \& Sourcetree 1.9.4

2) Yes, that's correct - I can verify that the .git/config file in my older GitHub local repo was modified to point to the new Bitbucket repo. Only thing I remember doing on the commandline was 'git init' inside the new repo when I created it. I have edited the older repo's config file to restore the correct remote url, but git status still reflects the other remote (tells me I have lots of pushes) - which is purely my issue in not fully understanding git, and I'll try to hunt down the cause before being tempted to give up and just re-clone.

3) Yes, they have distinct bookmarks \& hard drive locations (Hosted Repositories view even shows the distinct hosts).


author: Seth
body: Ok, a few questions and clarifications:

1) Git or Hg (Mercurial)? Windows or Mac?

2) Please remember that SourceTree is working with local repositories, and each repository should have an independent set of remotes. You say "an existing repository (also named origin) that I have been editing with sourcetree (hosted on github) appears to think it is pointing to this new repo". That makes it sound like Github has your new Bitbucket repo as a remote. I think you mean to say that your local clone of your GitHub repository now has the Bitbucket repo as its origin remote. Is this correct?

3) Please verify that the two local repositories are completely separate - they should be different SourceTree bookmarks AND reside in different locations on your hard drive.
Understand git rebase interactive
Asked by jmejiaa1986:

I'm using sourcetree with git and I am doing the following.

Creating a local branch from master called defect123. After making 10 commits to defect123 branch, I want to merge it into master but with only one commit with message "Fix for defect123"

Is this possible?


Answers:
author: crf
body: git fetch origin  
git rebase -i origin/master

When the editor appears, change the first commit to "r" and all of the others to "s" then save and quit. When the editor reappears, change the commit message to a summary of what the whole thing is.

If all goes well, you will have a rebased single commit for the whole work. You will have to force push it either explicitly or by deleting and recreating the branch:

git push -f origin mybranch # or....

git push origin :mybranch  
git push origin mybranch

Disclaimer: This rewriting of history will be frowned upon by many people. Whether or not it is okay to do this depends quite a bit on what your workflow is and who else might be looking at your branch. If anyone else is sharing your feature branch, then force pushing the single commit up is likely to cause chaos. In larger projects, the nice pretty clean history simply isn't worth the potential disruption and it is safer to do a simple merge. Another objection is that rewriting the history is somewhat dishonest, as it lies about the code base that you wrote your changes against, which can make it harder to sort out what went wrong later if somebody had introduced an incompatible change on the master. This is advanced stuff -- treat it with kid gloves.

comments: author: crf
body: Note: to actually get it onto master, you can either merge it or cherry-pick it over. This too is a controversial decision. Most people would prefer that you merge it, but again -- this depends a lot on your workflow and who else you might be working with.


author: jmejiaa1986
body: Thanks to all, I actually decided to just merge, I feel my commits may be more useful to me in the future than one big commit anyway..

Thanks.


author: Seth
body: Yes. You can do this by NOT rebasing, and just merging.

comments: author: jmejiaa1986
body: Can you explain? I've done merging a lot in the past and have never seen a way to do this.


author: Seth
body: Sure. How do you do your merges? Do you right click defect123 and select "Merge defect123 into current branch", or do you use the Merge button at the top of the window?


author: jmejiaa1986
body: Actually, I don't think I've done right clik and commit, when I do this it asks if I'm sure and I get the impression it will only merge that one commit and not all the work on my new branch.


Tags: git