youngmon/atlassian-qna huggingface dataset:
How to get new branch updated with updates to old branch?
Asked by Rolf Marsh:

I have an existing Git repo; the latest branch is 1.10.1. I need to continue to maintain branches off 1.10.1 for bug fixes. However, I want to start on a new major function for the app, creating a new branch (2.0.0) for this purpose.

My question is, using SourctTree, how do I create a new repo (2.0.0) that will be constantly updated with the branches off of 1.10.1?


Answers:
author: Seth
body: You should not use a separate repo, but separate branches in the same repo. You will have to periodically merge/cherry-pick changes to your 1.10.1 hotfixes to your latest branch.

If your question is how to maintain working copies of both 2.0 and 1.10 **at the same time**, then you can clone one local repository into another, and have each one checked out to a different branch. The 2nd repo will need to push to the first, which will need to do another push to remotes, which is inconvenient, but I haven't found a better way to implement 2 working copies of the same repository.
How to get SourceTree to stop making 'false' changes to files?
Asked by Jelissa Tycksen:

I found about 2 or 3 of the same question on google, one from this site, but I can't find the answer I'm looking for. I've had this problem with SourceTree since my company started using it, it'll say in uncommitted changes that I've made changes to files when I haven't even touched that file, sometimes EVER in the history of that file's creation.

I'm setting a new branch up on a new computer and it has a ridiculous amount of 'changed' files. Normally I just discard changes I haven't made before I commit, but holy geez, when I say a lot, I mean A LOTTTTT. With the amount that it is it's going to start getting really annoying going through and remembering which files I touched and which I didn't.

Can anyone give a simplified-ey-ish answer on how to get this to stop? I can't start marking files as ignored because I honestly don't know if I would ever need to make a change and how to reverse it. (SourceTree knowledge on a scale of 1-10 about a 1.2)

Help?


Answers:
author: Seth
body: It is probable that the changes are white-space only (line endings, if there are different OSes modifying files).

See if this helps: <http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace>


Tags: change

file
How to delete Commits?
Asked by paranoid93:

I'm new to SourceTree and some Merging kinda fucked up some datas, which completely ruined everything.

Is there a possibility to delete those 2 marked commits and set everything back on the lowest one shown in the screenshot?

![](http://oi60.tinypic.com/2zfil4h.jpg)


Answers:
author: Seth
body: Yes it is possible, but since those commits were pushed to a remote, it is going to cause a few headaches.

The first step is to get your local repository in sync with origin. I would do a soft reset to commit #1 (the bottom one), then "Stash" whatever is in your working copy (should be the changes you had committed to commit #4). Once you have a clean working copy, pull from origin. This should get you up-to-date with origin.

Secondly, right-click on commit #3 and select "Reverse Commit", then do the same thing for commit #2. This should remove the changes from your selected branch (paranoid-dev).

Thirdly, merge paranoid-dev to master.

Finally, push both branches to remote.

If you want to recover the changes you had originally made in commit #4, Apply the stash you created at the beginning of the process.

If your changes had NOT been pushed to any remotes (or pulled by anyone using you as a remote), you could acheive what you wanted with just the reset from the first step. However, it is dangerous to modify history that has been pulled or pushed to other machines, because other developers suddenly find that their repositories are unexplicably out-of-sync with their remote, and in trying to fix the issue, may restore the data that you tried to remove.
Updating to SourceTree 1.5.2 gives me error with SEH_AV_READ_BADPTR
Asked by jerone vw:

Today I got an update for SourceTree 1.5.2, an while running the updater I got the following error message:

```
[SEH_AV_READ_BADPTR] ACCESS_VIOLATION (0xc0000005) at address [0x0126301d]*** Stack Trace (x86) ***[0x0126301d]  -----[0x0376f738]  -----[0x76c21e4b]  GetProcAddress()[0x01292942]  -----[0x012929b8]  -----[0x0122e312]  -----[0x77a29f72]  RtlInitializeExceptionChain()[0x77a29f45]  RtlInitializeExceptionChain()[0x011d0000]  MODULE_BASE_ADDRESS
```

I had to terminate the updater process as cancelling didn't work!


Answers:
author: HenriqueA
body: Hi Jerone,  

I've found a user report on **Jan/07/2014** that have received the same error when tries to update the SourceTree on Windows platform as you can see on the following link:

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

<br />

This user solve the problem by killing the other SourceTree process and try it again.  

And I'm also quoting here the developer answer on this report:  

> We've seen this **extremely** rarely but it seems to be a failure in the Microsoft Installer subsystem. It's never been repeatable whenever we've had it reported, incidence seems to be maybe one in a hundred thousand installs judging by the reports.

<br />

Kind Regards,  
Henrique Lechner
disk1.cab invalid digital signature
Asked by John Reeder:

When I try to install any sourcetree version I get an error that the digital signature of the disk1.cab file is invalid. This started last week when I tried to update to 1.5.1. When it didn't work I tried to reinstall with my old installer for 1.4.x. The old installer gave me the same error. I just tried again with 1.5.2.

I am on an enterprise windows 7 image with pretty tight restrictions. It seems to be that the certificate you signed with can't be verified. I was able to install the 1.4.x version about a month ago so it would seem something has changed with the certificate.


Answers:
author: John Reeder
body: It seems the issue was with something on my domain account. I logged into the local administrator account and the software installed just fine. The issue then was some combination of security restrictions of our domain policy and my domain admin account.


author: Eduardo Nieto
body: I've just got this error on my Windows 8.1 (64-bit) pc. When I run SourceTreeSetup_1.6.20.exe file and click "Install" the installation process runs fine for a while and then it stops prompting the error I'm attaching as an image.

source_tree_error.png

I tried running the app as an Administrator but didn't work either.  
[](https://community.atlassian.com/t5/Sourcetree-questions/disk1-cab-invalid-digital-signature/qaq-p/184324?attachment-id=2170){#link_116b93e12a79c8}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/5405/1/source_tree_error.png){#display_116b93e12a79c8_0}


author: David_Mills
body: Hi,

we are getting this error on VMs for release 1.6.7 and later. 1.6.5 installs fine. As do 1.6.7 on Windows 7.

Is there any way of working around this?


author: KieranA
body: Hey John,

Our certificate expires in 2015 and this is the only report we've had of this meaning others have installed successfully. We haven't changed the signature in any way either.

Could we get the precise error you're seeing so we can get a better understanding of what's happening?

Cheers
Where can I find a glossary of the icons used in SourceTree?
Asked by TheRealRaphi:

In SourceTree, there are lots of icons used to convey different information - some of which is more clear than others.

Is there a glossary of the logos/icons you use? It would greatly help my undersanding of the software and workflow.

Thanks!


Answers:
author: Umair Hassan
body: ST-NEWUI-help.PNG\>\>Sorry for a bit of funky look in the images i made, but it helps understanding what each button do, and what each button stands for... :smile:  
[](https://community.atlassian.com/t5/Sourcetree-questions/Where-can-I-find-a-glossary-of-the-icons-used-in-SourceTree/qaq-p/104243?attachment-id=10738){#link_116b93ed4f7d6f}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/2949/1/ST-NEWUI-help.PNG){#display_116b93ed4f7d6f_0}

comments: author: Gordon Waddell
body: Ping - I would also like to know this - what is the R for instance? Can I rely on that as a rename/move?


author: Umair Hassan
body: Yes, its mean it is renamed.


author: Seth
body: <https://answers.atlassian.com/questions/269451/what-do-bookmark-icons-mean>


author: Martin Dube
body: Thanks [@Umair Hassan](/t5/user/viewprofilepage/user-id/797147) for the original image.  
I (re)designed it using Google Drawing to have a better CheatSheet to print.

![Atlassian-Sourcetree-status-icon-lexicons_small.png](https://community.atlassian.com/t5/image/serverpage/image-id/21341i59C57E7101924FC3/image-size/large?v=v2&px=999 "Atlassian-Sourcetree-status-icon-lexicons_small.png")

[http://1idweb.com/doc/cheatsheet/Atlassian-Sourcetree-status-icons-lexicon_1idweb.pdf](http://1idweb.com/doc/cheatsheet/Atlassian-Sourcetree-status-icons-lexicon_1idweb.pdf "PDF")

comments: author: Umair Hassan
body: good work :)
Discard stashed hunk -- how to get it working?
Asked by Corey Knight:

Does unstashing individual hunks actually work? This consistently fails on every git repo on my Mac.

Steps:

1. Checkout a repo.

2. Make some changes. (even just 1 tiny change)

3. Stash changes.

4. View the Stash.

5. Press "Discard Hunk" on any hunk.

Expected: discard the hunk.

Actual: the attached error message.

![](../../../upfiles/Screen_Shot_2014-04-17_at_12.16.50_PM_1.png)

Question: Am I doing something wrong, or is this feature just broken out of the box?


Answers:
author: Seth
body: I don't think you can modify stashes in this way. SourceTree always displays the "Discard Hunk" and related buttons in the diff view, even though they aren't relevant here.

The reason for this is that all of those types of changes (discarding hunks or file changes) are performed on your working copy, but your stash is, by definition, not on your working copy.

To get what you want, you should apply the stash to a clean working copy, make the modifications you want, then create a new stash.

You may consider filing a bug at [jira.atlassian.com](http://jira.atlassian.com)requesting that the developers remove/disable those buttons when viewing stashed diffs. If so, answer this question with a link so others can vote it up if they want to.


Tags: git

hunk
SourceTree / Deleted subrepo and unable to switch branch
Asked by doggan:

Hello. I'm using SourceTree (1.8.1) with Bitbucket and Mercurial.

My repository is using Git flow (or Hg flow in this case) with subrepositories. When I execute the following steps, I get into a state where I am unable to switch into the default branch.

* Set up basic repository structure with two branches: default and develop.
* Both branches reference a subrepository called X.
* With the develop branch as active, I delete the subrepository X (which updates the .hgsub in the develop branch) and commit this change.
* This creates a state where the subrepos X is not referenced from develop, but is still being referenced from default.
* In this state, if I try to switch to the default branch, I get an error (abort: http authorization required) and cannot switch out of the active develop branch.

I'm not sure what to do to be able to switch into the default branch again, or why it ends up in this state. Thanks for your time.


Answers:
author: doggan
body: I was able to resolve the issue by manually editing the .hgsub and .hgsubstate files (via the Bitbucket web interface), and deleting the reference to the subrepository X in the default branch.

Still, I would like to know why this issue happened and if there is a better way to resolve it,s o I am leaving the question as unanswered. Thanks.
"Check out in sourcetree" not working on Mac
Asked by E.L. Fridge:

I've recently switched from a PC to a brand new Mac. We use a Stash server and I use Sourcetree to manage my branches, etc. On the PC, the "check out in sourcetree" function used to work well. I would click it, a dialog would appear, and it would fetch the new branch and then check it out. On the Mac, it seems like it fetches the branch but then I get an error message. The message says:

```
"Cannot update paths and switch to branch 'xxxxx' at the same time.Did you intend to checkout 'origin/default' which can not be resolved as commit?"
```

Here's a link to a [screenshot of the problem](http://www.screencast.com/t/Jlq7eFyNjtsF)as well.


Answers:
author: Seth
body: Have you tried copying the URL from Stash into SourceTree's clone window instead of using the SourceTree button?
SourceTree 1.8.1 Crashing on OSx Lion (10.7.5)
Asked by PaYQA:

I have recently downloaded and installed SourceTree 1.8.1 but it continually crashes when opened. I have tried to completely uninstall it, but there is nothing in \~/Library/Application Support/

One thing I am seeing in the error reports is this;

KERN_INVALID_ADDRESS at 0x00007fff5fc01028

Is it that 1.8.1 is not backward compatible with my version of OSx, and if not, is there an older version of SourceTree I can use?


Answers:
author: HenriqueA
body: Hi PaYQA,  

The latest version right now ([1.9.4.1](http://downloads.atlassian.com/software/sourcetree/SourceTree_1.9.4.1.dmg)) support MAC OS X 10.7+ so your system is supported.  

Here the directly link to download the SourceTree 1.9.4.1 for MAC OS X:

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

I suggest you to try the newest SourceTree version and let me know if you still facing this issue.  

Kind Regards,  
Henrique Lechner
This is not a valid source path / URL on Mac Client
Asked by Rahul Joshi:

I am using SourceTree to work with one of the repositories I created online at source tree. When I go to clone repository on my Mac and select the repositories from the hosted account, it gives me the following error:

This is not a valid source path / URL

on checking the details, it says:

fatal: unable to access '/usr/local/git/etc/gitconfig': Permission denied

Any idea what might be the issue?


Answers:
author: Rahul Joshi
body: I checked that, it shows permission denied on /usr/local/git

comments: author: Seth
body: I don't think you understood my question. In the terminal, go to /usr/local/git/etc/, and run "ls -l". Your user account will probably need to be the owner of the gitconfig file, or possibly a member of the group (depending on the premission bits of the file). Do you know the name of your user account or what groups it is a member of?

I suspect this isn't a sourcetree problem, and would be better listed as a question on StackOverflow. If you post there, be prepared to try some things in the terminal to diagnose the problem.


author: Seth
body: Sounds like an ownership/permission problem on your local git install. Check the ownership and permissions on the listed file, and post here.
Outgoing count in Sourcetree only works for Hg and not for Git
Asked by Marcos Bozzani:

Hello.

The outgoing count in Sourcetree only works for Hg and not for Git. I would like to know if there is a technical reason for that or is it just on my machine.

I'm using version 1.5.1 and deselected the option "Use staging area" in Tools \> Options \> Git.

I've already create a new Git repository from scratch, made a commit and the outgoing count didn't change.

For Mercurial repositories is works all right. After I make a commit the number 1 appers over the Push button and in the bookmarks too.

Thanks,

Marcos


Answers:
author: Marcos Bozzani
body: PS: I'm using Windows 8.1
Installation error for SourceTree
Asked by Helene Douglass:

I am trying to install sourcetree. I get all the way to the ready to install screen, I click on 'Install' and immediately get a popup message, "Are you sure you want to cancel SourceTree installation?" with the standard Yes / No options.

Has anyone else had this behavior and do you have any information on how to get the install to work?  

I am currently running windows 7, I have .net 4.5 installed.

Thank you for any help you can give.


Answers:
author: mikeshivas
body: Try right-clicking on the installer and select "Run As Administrator"


author: Paresh
body: Very surprised no one answered to this query. I'm not able to update SourceTree due to this error. Same error pops up when i try to uninstall.

How did you manage to upgrade?
Sourcetree not honoring Stash default branch?
Asked by David Haynes:

I have set up a repository in Stash that has the default branch set to 'develop'. When I git clone this using the command line in Linux, I get the repository cloned with branch 'develop' set. When I try the same thing from SourceTree, I get the clone with branch 'master' set.

If I try the clone using the terminal to MINGW32, I get the master branch as well.

Is this a limitation of not being on the 1.9 git release?


Answers:
author: David Haynes
body: Installed the beta version of the msysgit 1.9.0 release. Cloned repository and got the develop branch. Looks like 1.8.3 vs 1.9.0 functionality issue.
Password not persisting after 1.5.1 update
Asked by Steve hueners:

After taking the recent update I'm getting intermittent prompts to enter my password. After authentication I am correctly gaining access to my repo but some seemingly random number of minutes later am getting prompted again.


Answers:
author: Arie Litovsky
body: I'm having the exact same issue on SourceTree 1.6.20.0 on Windows and it's driving me bananas.
Crucible, git, ssh, gitolite repository access help needed
Asked by David Senterfitt:

We are just setting up Crucible/Fisheye to access our repositories. We use git with ssh and gitolite for access controls. I am unable to get a repo added to Crucible. Our typical git clone command will look like the following: git clone <ssh://git@mygitserver.com/testing>. I have created a passphraseless public/private key pair and uploaded the private key into Crucible. I have also used gitolite-admin to upload the public key into mygitserver for ssh and git access. I can't seem to get Crucible's repository details correct for successful connection.


Answers:
author: David Senterfitt
body: Ok, I found the answer in another post. It turns out I needed to change the format of my git connection details. Here are the values that worked for me. Repository Location: git@mygitserver.com:testing. Path: \<empty\>. Authentication Style: Upload private key for ssh. Apparently the key is the ":" before the repo name "testing".

comments: author: buff buff
body: Hi. I am having a similar problem to you. Where you finally able to use sourcetree to connect to gitolite? If so, please can you explain what you did.


author: David Senterfitt
body: I was having an issue with Crucible connecting to a GIT repo using an SSH connection with GITOLITE configured for authentication. I don't do anything with sourcetree. I have resolved my described issue as mentioned in previous post.


Tags: fisheye-crucible

git

gitolite

ssh
SourceTree: any way to select 0 lines of context?
Asked by Rob Bednark:

I love SourceTree and love the pane of diffs. I would really like to be able to choose 0 lines of context (currently the options are 1 3 6 12 25 50 100 lines). Is there any way to do this? If not, how do I make a feature request?

I'm using SourceTree 1.8.1 on Mac OSX Mavericks 10.9.2


Answers:
author: Rob Bednark
body: Thanks @Seth_Foss! I have opened a feature request for 0 lines of context: [](https://jira.atlassian.com/browse/SRCTREE-2203)<https://jira.atlassian.com/browse/SRCTREE-2203>


author: Seth
body: You should be able to open a feature on [jira.atlassian.com](http://jira.atlassian.com)

Be sure to post the link to the request as an answer to this question so like-minded individuals can vote for it.


Tags: diff

git
Error Message "I don't handle protocoll ssh"
Asked by Hans Eurst:

I'm trying to set up SourceTree on a Windows 7 Machine. The repository I'm trying to connect to is available over ssh with a standard username/password account (no private/public keys!).

I'm using the following syntax for the URL:

ssh://username@server/\~/folder/repository.git

Source Tree says "Invalid Path/URL" and when clicking "details" it says: "fatal: I dont't handle protocol ssh"

I tried the same URL on different Machines and it works great on a different Windows as well as a OSX Maschine.

What can i do? Do i need to install any third party software?


Answers:
author: Grunde Waag
body: I have the same problem if I use system git (version 2.5.1), but if I change to embedded git (version 1.9.5) I'm able to clone the repos.
SourceTree, TFS and remote branches
Asked by nevin mysser:

Hi,

I have just started using SourceTree with my TFS (online version) repo and I have an issue.

If another developer updates the remote repo, I do not see his changes. Refresh does nothing. My local repo is 2 commits behind the origin/master according to him and TFS but SourceTree refuses to show me that.

I can pull and it will get his changes so it's communicating fine when I do an action but what gives with the status?

Second question. How do you clone a remote in ST when TFS isn't an option in Hosting Service dropdown? I have to clone in the command line and then open that working folder to even see a remote. Not the smoothest unless I am missing something obvious.

thanks

Nev


Answers:
author: Seth
body: Try "fetching" (get information from remote(s)) instead of "refreshing" (check for local changes).

You can type the remote URL directly into the add repository dialog.
Confluence down
Asked by Andreas Schierz:

Hi,

our Confluence site is down... I?m writing this here, because also the support is not reachable (502 bad request).

Dows anyone else face this problem too? Any ideas what i can do?

regards

Andy


Answers:
author: Stephen Sifers
body: Hello y'all, repeating our messaging from our [Support site](https://support.atlassian.com/) to ensure everyone has updated information.

We have identified the root cause of an issue with an internal infrastructure component that has been impacting multiple Cloud products (including Jira Software, Jira Service Management and Confluence) and customers. This issue had led to a performance impact and, in some cases, outages. We have implemented a fix to resolve the issue and recovery is in process.

Further updates will be posted to our [incident report](https://status.atlassian.com/incidents/pzh5b8cvfk2g) directly.

Regards,  
Stephen Sifers \| Community Product Lead


author: Andreas Schierz
body: [@Jan Niklas R?sch](/t5/user/viewprofilepage/user-id/5130806) and [@Peter J Lennartsson](/t5/user/viewprofilepage/user-id/4258304) : Thank u very much for your answers!

I hope someone of the Atlassian Masterminds also reads this post:

- in their issue update they mention "The performance issues would have caused inaccessibility" - this is not would have!!! It caused inacessability!

- How are these deployments tested?!?!? -\> at customers?

- funny, Atlassian is forceing customers to move to cloud, where we do not have any control of their updates AND obviously Atlassian does not have a valid testing process BEFORE roll out

-\> does not promote much trust

@community: What u think

r

Andy


author: Jan Niklas R?sch
body: you can subscribe to the incident updates here: <https://confluence.status.atlassian.com/incidents/tszykx9pgb2q>

comments: author: Andreas Schierz
body: thx!!!


author: Peter J Lennartsson
body: Yes same issue here, Jira works fine but can not even make a ticket with support at the moment for the confluence issues getting 502 or 504 errors when doing that

Using European servers fyi


Tags: atl-070623

cloud

confluence-cloud