youngmon/atlassian-qna huggingface dataset:
How will SourceTree's Git Flow initialization effect my team's existing repository?
Asked by Todd Mullen:

I started working with a young company that already has a codebase / Git repository in place. They use the command line for Git and they recently have had a few issues with conflicts / confusion. I was just introduced to SourceTree a few weeks before starting, so I don't know it really and I also don't know much about Git yet. My research into Git and Git workflows suggested that what my PM had been discussing as how we should change / standardize the procedure was nearly identical to what I found for the Git-flow process. I showed it to my PM and he agreed that it was what he was imagining.

I really like SourceTree and have been trying to move to Git VCS. I'm not a command-line user, so I really want to use SourceTree and its built in Git-Flow support. I'm also trying to bring it to their attention, but I'm worried what's going to happen if/when I initialize the Git Flow process (use the button). I see the prompts for branch prefixes, which are similar to what is already in place, but I don't know what will be changed in / about the repository. I don't want to say say "Hey I'm going to use this..." and then confuse the heck out out of the other developers because everything is changed and/or broken.

...In addition, I don't think they'd be interested in converting to or using SourceTree at that point.

Thanks in advance.


Answers:
author: Seth
body: The only thing that happens when you initialize Git Flow is the creation of a local-only config file for Git Flow.

Once it has been initialized, Git Flow simply provides educated guesses about the next step of your workflow whenever you hit that button. It does not remove or restrict any other Git functionality, so you (or your teammates) can continue to create branches or perform merges that do not comply with the Git Flow model using the Branch and Merge buttons.

SourceTree is not required for Git Flow. It is a separate Git extension. If your teammates prefer the command line, I recommend [](https://github.com/petervanderdoes/gitflow.)<https://github.com/petervanderdoes/gitflow>. It is also trivial to follow the git flow model without any git extensions as long as a developer is disciplined enough to stick to the naming conventions.

comments: author: Todd Mullen
body: Cool, Thanks Seth. 8)

I thought that was probably the answer, but didn't want to risk it after searching for the answer and reading about problems people have had. I just didn't want it to rearrange the remote repository, change branch names, or cause people's work to be lost - just set Git up locally to handle my branching processes so that I can focus on coding.


Tags: git-flow

repository
Is there a windows hotkey to open a repository (or bookmark)?
Asked by Ben:

Seems like this would be a no-brainer, but I just can't find it. Is there a SourceTree for Windows hotkey to open a repository (by bookmark name)...ie hit ctrl+O or something, and start typing a name of a repo/bookmark instead of searching through my (probably too long) list/folders of bookmarks?


Answers:
author: Ben
body: Done. See [SRCTREEWIN-1767](https://jira.atlassian.com/browse/SRCTREEWIN-1767)


author: Seth
body: I don't know of one, I only have 6 myself. If it doesn't appear to exist, file a feature request at [jira.atlassian.com](http://jira.atlassian.com).
Doing a selective "checkout" using SourceTree
Asked by Ev Haus:

Is there a way in SourceTree to do a selective file checkout as described on this page: [](http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/)<http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/>

I wasn't able to find any equilavent workflow in SourceTree, since merging from another branch automatically takes all files.


Answers:
author: Seth
body: Yes, there is a way to do this from SourceTree. Push the "Terminal" button at the top of the window.

comments: author: Ev Haus
body: That's not helpful. I'm looking for a GUI where I can review available commits and select the ones which I want to checkout.
PC crashed on commit and lost local workspace
Asked by Silvia Ramos:

Hello,

I'm a bit on panic mode at the moment. This is what happened: I just got a blue screen on my PC right when I was doing a commit into a local branch.

After restarting the PC I openend SourceTree and saw that I was checked out at the master branch instead of the branch in which I was working before the crash. What's more, the branch has disappeared completely and I have no local history at all.

The good news is that it looks like all the changes that I had made are still there. I see all the files in "Staged changes", but I need to stash them before I can switch to another branch (as I don't want to commit to master yet) and I'm getting the following error:

```
git -c diff.mnemonicprefix=false -c core.quotepath=false stash save AfterCrashfatal: bad revision 'HEAD'fatal: bad revision 'HEAD'fatal: Needed a single revisionYou do not have the initial commit yetCompleted with errors, see above.
```

Is there a way to recover the status of my workspace before the crash? What would be the best way to solve this issue?  
I will really appreciate any help. Thank you!


Answers:
author: Silvia Ramos
body: Well in the end I decided to start from scratch and clone the remote repo again.

Then I replaced the files by mine and now I can confirm that all the modifications are there. That was close :-D


author: Mia Paulin
body: [@mention](/t5/user/viewprofilepage/user-id/732788) Do you have a system restore point for your local system and everything on it? What is exactly wrong with your workspace and what exactly happened with your commit? The system restore will have everything you had before, including the branch you couldn't fing and all of your history that was erased. Try that. It's easier than having to reset the whole thing. A lot of people had this prbloem with sourcetree. But, see if it works. I hope I was able to help.


author: designburo
body: I too get bluescreens on commits, Not always, but often. Stopped using the windows version and do it on the Mac version that seems to work fine.


author: Pierre-Etienne Poirot
body: You could solve that error by applying the following command:

```
git symbolic-ref HEAD refs/heads/name-of-the-branch-you-were-on
```


Tags: bitbucket-server

crash

restore

revision

workspace
Strange: two different Sourcetree with same version?
Asked by Antoine C?ur:

I got the same OS X 10.9.3 on two computers.

I got the same Sourcetree 1.9.3.1 (1.9.3.1) on those computers.

Yet, the look and feel for those two Sourcetree is different!

[](http://i.imgur.com/y6cHoj0.png)<http://i.imgur.com/y6cHoj0.png>

[](http://i.imgur.com/Gl4ThQg.png)<http://i.imgur.com/Gl4ThQg.png>


Answers:
author: Seth
body: I'm guessing that there is some UI element that is set in the initial version that is not modified by upgrades. Were both SourceTrees initially installed at the same time (same version)?


author: Antoine C?ur
body: Still different after upgrading both to 1.9.4.
How do I push individual Hg branches?
Asked by thomthom:

I have a repo at BitBucket which is public. However, I'm working on some changes I don't want to be visible until I release. For this I made a private fork of the repo where I push those secret changes.

But I still want to push changes to the other branches to the public repo. But I cannot seem to figure out how to push just some spesific branches. It appear to be all or nothing. Is this a Hg limitation? SourceTree limitation? Or have I simply not seen the option that control this? (I'm looking right at it, right?)


Answers:
author: thomthom
body: Found it. In the Push window, unfold the Advanced Options and then enter the branch name there.

I wasn't sure that was what I wanted to use when I found that field. I was searching for a while before I found references that mentioned it. Is there some UI documentation for SourceTree that mentions these fields? I wasn't sure what syntax to use in this field.

comments: author: Seth
body: I use Git, not Hg, and the Git push window gives you a list of branches, and you check or uncheck which ones you want to push.

Alternatively, you can right-click a git branch in the branch list and choose "Push to...", which brings up the push window with just that one branch selected.

I would be surprised if the Hg UI was significantly different.


author: thomthom
body: I expected it to be alike as wekk - but the UI is different.
Mac client incredibly slow since lastest update
Asked by Jeremy:

Has anyone else noticed this issue? Searching twitter I see a few others mentioning it. The app seems to hang constantly -- spinning beachball here and there. No changes on my end other than updating SourceTree. Running Mac OS 10.9.3.


Answers:
author: HenriqueA
body: Hi Jeremy,  

Please let me know which SourceTree version are you using.

And also to do a better trouble shooting on it I'll ask you to execute the SourceTree through the terminal and check if there are any error on that.  

Kind Regards,  
Henrique Lechner
How to commit a part of a file
Asked by Alexis Sanchez:

I'm using SourceTree 1.9.3.1 with Mercurial on Mac OSX 10.9.3.

I come from TortoiseHg on Windows, where it is possible to select the exact lines I want to commit within a file. Any unselected lines are available for selection on the next commit.

Sadly THg isn't supported on Mac. How can I make SourceTree behave in this way?


Answers:
author: Alexis Sanchez
body: Hi Seth,  
Where is the staging area option? I can see an option to stage files in the Git settings but not in the Hg settings.


author: Seth
body: Firstly, you should turn on the staging area (I believe it is off by default in 1.9). Once you have it on, you can select lines to stage in the diff view of each uncommitted file. Then you commit what is in staging.

comments: author: Alexis Sanchez
body: Hi Seth,  
Where is the staging area option? I can see an option to stage files in the Git settings but not in the Hg settings.


author: Seth
body: I only use Git, but now that you mention it, I remember reading somewhere that Staging is a Git-specific concept. I guess I have no idea how you'd pull it off in Hg.

You might still try highlighting lines in the diff view to see if any extra options are presented (as buttons above or below the hunk).


author: Alexis Sanchez
body: I don't mean something at the source control level, I mean something in the interface level that just lets you commit only selected changes. If staging is a Git concept then that's overkill - the TortoiseHg feature works only in the UI and isn't part of Mercurial.

There are no options if I select lines in the diff view.

Back to trying to get TortoiseHg to run on Mac...
Sourcetree 1.5.3 release date
Asked by Michael:

Does anybod know when SourceTree 1.5.3 (Windows) will be released?  
The[project road map](https://jira.atlassian.com/browse/SRCTREEWIN?selectedTab=com.atlassian.jira.jira-projects-plugin:roadmap-panel) says April 16th, but that was already 6 weeks ago.


Answers:
author: Seth
body: I'm guessing it's been delayed because of the strong negative reactions to initial versions of 1.9 (for Mac). They only recently put out 1.9.3 to address the last of the big complaints.

It generally appears that features are made for Mac's SourceTree first, then released to Windows next, so hopefully it'll be out this month.
Need some guidence on rolling SourceTree out within our office.
Asked by Patrick O'Hara:

We are in the process of switching to Git. We have purchased your Stash server and have settled on using either msysgit or SourceTree as the "supported" clients. I am in the process of giving training on Git and how it differs from our previous source control tool (ClearCase). As I have been putting together the installation instructions I am disappointed by two things.

1) It appears that everyone will need to register with Atlassian to get a license for SourceTree. I would prefer to point people to a license file, but it appears that the license file is user specific.

2) It does not appear that you have any type of tutorial for SourceTree. Although I am giving Git training I am using the command line in my training because that is the lingua franca of the Git world and because some of us will be using the command line. I understand that much of using SourceTree is fairly obvious to someone familiar with Git, but there are things that are not. Some of the settings, finding rebase on the context menu of a commit, etc. It would be nice to have a say 20 minute tutorial that goes over this stuff, assuming that the user is already familiar with Git.

Thanks for the great products, obviously if those are my only complaints I am very happy with both Stash and SourceTree.

Pat O


Answers:
author: Cathy Sanders
body: With regards to question 1, we had the same type of question and the answer we received from Atlassian was to register for SourceTree using an enterprise email address:

[](/questions/166460/what-is-the-best-way-to-register-for-sourcetree-licenses-as-an-enterprise?page=1#166825)<https://answers.atlassian.com/questions/166460/what-is-the-best-way-to-register-for-sourcetree-licenses-as-an-enterprise?page=1#166825>

We generally script our installs and include copying the license file into the appropriate location on the user's machine.

Git is definitely a bit of a mind switch from ClearCase. There are times I still miss my version trees...

comments: author: Patrick O'Hara
body: Thanks, not sure why a search for SourceTree license did not find that. I am not aware of a "corporate email" account, but I can look into it. Seems like SourceTree with Stash should be automatically licensed to me, but it is not too much of a bother.


author: Patrick O'Hara
body: Turns out it was more work than I am willing to pursue to find/create a corporate email. Just going to tell everyone to register.


author: Cathy Sanders
body: Our team has a mailbox within our corporate system that we were able to use. You could probably also use the address for someone that is considered the Atlassian account representative (such as the contact for your Stash licenses). We just had an option already available for us that was more generic instead of all of the license files containing the contact as a single person.

comments: author: Patrick O'Hara
body: Makes sense and we may have such a thing, I am just not aware of it.


Tags: bitbucket-server
SourceTree aborts merge
Asked by Christian Reiter:

Hi!

When I try to do a merge in SourceTree the following situation happens very often:

Usually I start the merge using the "Merge" toolbar button. I then get the text "Merge:" before my repository in the left hand side repository list:

<br />

If I then have conflicts I start resolving them and at some point while resolving my conflicts the "Merge: " label vanishes and SourceTree seems to no longer recognize that I'm doing a merge. If I commit from such a stage the history doesn't show that I've merged (no joint history lines) and I still have two independent branch histories.

Why is that?

Any help is greatly appreciated cause this is really annoying, especiall when dealing with big complicated merges.

Thanks,

Christian


Answers:
author: Christian Reiter
body: Hi Henrique!

I'm running SourceTree on Windows, so I think SRCTREE-2439 is not related to my situation.

Could it be, that an open NetBeans (or it's Git plugin) instance is the reason for loosing the merge state?

Best Regards,

Christian


author: HenriqueA
body: Hi Christian,  

Look into this issue, I've found this bug report that seems related to this issue, as you can see on the following link:

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

This bug is fixed on version 1.9.4 (for MAC OS X).

If you still facing this issue let me know which version you are using.

<br />

Kind Regards,  
Henrique Lechner

comments: author: Christian Reiter
body: Hi Henrique!

I'm running SourceTree on Windows, so I think SRCTREE-2439 is not related to my situation.

Could it be, that an open NetBeans (or it's Git plugin) instance is the reason for loosing the merge state?

Best Regards,

Christian


Tags: merge
SourceTree Keychain popup: git-credential-sourcetree wants to use
Asked by racecarr:

Ever since SourceTree 1.9 I've been having trouble with the OS X Keychain not remembering that I've allowed SourceTree to have permanent access to the stored credentials for our Stash server. I have to keep hitting "Allow" even though I've clicked "Always Allow," as well.

It's possible it may have coincided with Mac OS X 10.9.3 update, as well (that just came out, didn't it?)

Here's the popup message I get (every time SourceTree connects to Stash)

[Keychain Popup Error](https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%20Keychain%20popup.png "Keychain Popup Error")

I've even tried checking "Allow all applications to access this item" but it keeps getting recent to this (and this SHOULD work.)

Here's the "Internet Password" entry in OS X Keychain

[](https://www.dropbox.com/s/cw5209r071xgohv/Keychain.png)<https://www.dropbox.com/s/cw5209r071xgohv/Keychain.png>

<br />


Answers:
author: Matt Heisig
body: I had this same problem and it was infuriating. Fortunately, upgrading SourceTree to 1.9.3.1 resolved the problem for me.

comments: author: racecarr
body: It's only happening on one of my two Macs. I'll know if the upgrade fixes it tomorrow.


author: racecarr
body: Updating to 1.9.4 also fixed it


author: Iggi
body: Funny how I'm still having this problem in 2020, I blame this on Apple though as I've experienced this same problem in one way or another with all of their products. They demand you link up with other services, or they punish you with alerts and popups non-stop till you are shaking with rage. None of the above solutions worked for me but I found one that did-  

Remove the Atlassian/BitBucket association from SourceTree. Preferences\>Accounts\>RemoveAccount

comments: author: lschlesinger
body: Man! Thanks for this! you saved my day!


author: Harry Hollander
body: Yes Fernando me also, so frustrating


author: Fernando Raviola
body: happening again on latest version 2.2.3


author: Mark Douma
body: First URL should be [https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%20Keychain%20popup.png](https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%2520Keychain%2520popup.png)


author: Mark Douma
body: Hmm, let's try this again. First URL should be: [](https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%20Keychain%20popup.png)[https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%20Keychain%20popup.png](https://www.dropbox.com/s/j6yfum54ym1ibvw/SourceTree%2520Keychain%2520popup.png) Looks like the software makes %20 into %2520 in the URL.
Who likes the new SourceTree 1.9 UI?
Asked by rzero:

In today's blog post I read "The feedback we've received from the wider SourceTree community since indicated that although many people did like the new style and found it more approachable, a lot of existing users thought we simplified things too much".

Where are these people who like the new style? Are any of them on this forum? Just curious.


Answers:
author: Seth
body: At this point you are beating a dead horse.
"The older version of SourceTree cannot be removed"
Asked by pwalker1:

In attempting to upgrade to version 1.5.2 (one of many SourceTree updates applied to this machine in the past), I get "The older version of SourceTree cannot be removed" on Windows 7. I removed the program with the Programs and Features Control Panel and cleaned anything relevant I could find from the registry, but the error continues. Any ideas?


Answers:
author: Foong
body: Hi Phillip,

It could be a problem with the MSI database. Please try running Microsoft Installer Fixit tool: [](http://support.microsoft.com/kb/290301)<http://support.microsoft.com/kb/290301>

comments: author: pwalker1
body: That worked. Thanks.


author: Anders Kielsholm
body: I had the same issue when updating to version 2.0. I could see there were a lot of installed SourceTrees \<v2.0, but the registry entry seemed to be corrupt. When I deleted them from HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432\\Microsoft\\Windows\\CurrentVersion\\Uninstall (not that WOW6432 might be left out in some cases) it worked. There was one key ("folder") per installation

comments: author: dneelyep
body: This worked for me.


author: IgorYastrebov
body: In many cases, the problem is with MSI registry - corrupted reg.

Here is the only tool can fix corrupted MSI registry: <https://support.microsoft.com/en-gb/mats/program_install_and_uninstall/en>


author: maximbo
body: I never before install SourceTree on PC, but they say me same "The older version of SourceTree cannot be removed".

I used Windows 10.

The fixit dont work, any ideas for install sourceThree?


author: Matthias Shapiro
body: Having the same problem. I've deleted the Sourcetree files and the local data.   

The Microsoft Installer Fixit tool is no longer at the url. When I search for it, I get a message that says it is not supported on my version of Windows (I'm running Windows 10).

I need help here. I can't reinstall Sourcetree and I can't uninstall Sourcetree.


author: dariomangoni
body: Hi,  
I'm with version 1.6.22.0, but I get the same problem. I tried to install the new version (1.7.0) and it gives the same message. Actually the application has been removed from the application list so I can't try to do it manually. Any suggestion?


author: Foong
body: Hi Phillip,

It could be a problem with the MSI database. Please try running Microsoft Installer Fixit tool: [](http://support.microsoft.com/kb/290301)<http://support.microsoft.com/kb/290301>
Does SourceTree really download embedded Mercurial over non-encrypted channel?
Asked by Soren Dreijer:

Hi there,

I just installed SourceTree and it asked me whether I'd like to use an embedded version of Mercurial or if I'd like to download it manually. I chose the former because I'm lazy, but as far as I could tell from the download dialog, Mercurial was actually downloaded over a non-encrypted channel.

Is that really true?


Answers:
author: Soren Dreijer
body: It matters because SourceTree could be downloading arbitrary data from the Internet without verifying the source. For instance, I could be at a coffee shop or conference where I don't control my connection to the Internet and a malicious user could be feeding me a bad package.

It's like saying we should have strict security at the airport and prevent people from bringing water bottles into the terminal, but also that we don't really care to screen any of the vendors selling water bottles inside the terminal...

To top this off, imagine I had just installed SourceTree via the provided installer and that SourceTree had subsequently been launched by that installer. The installer probably ran as Administrator on my machine, so unless the SourceTree devs were extra careful, this means SourceTree will now shell out to the downloaded Mercurial binaries with Administrator privileges. You can probably see why that's bad if the package didn't actually come from Atlassian's servers. :)


author: Seth
body: It may be true. Why does it matter? I don't think Mercurial's executbles and libraries contain any of your sensitive or private information.
My licensed version of SourceTree is now saying the trial expires on June 20
Asked by Roger Joys:

Hello, my purchased copy of Source tree is now telling me that my free trial expires on June 20.

How can we rectify this?

Thank you


Answers:
author: Seth
body: <https://answers.atlassian.com/questions/154537/is-sourcetree-free>

If you paid for SourceTree anytime recently, you got scammed.