youngmon/atlassian-qna huggingface dataset:
Two users editing same files unable to push changes
Asked by Nicholas Maddren:

Hey guys, I am a little bit confused using Source Tree with BitBucket right now.

So we are using Gulp to mix all of our JS files and CSS files so whenever we make changes to our project our main.js file and main.css file's will always be mixed and need committing in Source Tree.

This is causing big issues for us with Source Tree because if I or my colleague edit the same files we are unable to merge or push to our live server because we get errors.

Here is a scenario that we have quite often:

I will be working on a file at the same time as my colleague, my colleague finishes his work with that file and commits it then merges his branch to the main branch and then push's it to the server.

Meanwhile I have been working on the same file on my own branch and commit my changes to my branch. I then notice that I have a pull notification for the main branch so I pull it, I then try to merge my branch to main branch however I get conflicts because the file that I have been working on has changed.

Any idea how we can solve this issue?


Answers:
author: Seth
body: You could resolve the conflict by re-running Gulp so it generates new files (based on the merged separate JS and CSS files) that overwrites the conflicted main files.

After doing so, if SourceTree still says the file is conflicted, you can right-click it and "mark as resolved".
How to apply sourcetree.license to version 1.8.x?
Asked by H?kon K. Olafsen:

Starting with version 1.8.x (I think) the first time you start SourceTree you get a "activation" splash screen. Here I accept the license agreement, then I move on to "Atlassian account" where I'm asked to *use and existing account* or *got to My Atlassian* for signing up. There is no option to apply a downloaded .license file.

How can I use SourceTree on a computer that's not connected to the internet?


Answers:
author: H?kon K. Olafsen
body: I found the solution, don't upgrade to 1.8.X - it's that easy.

Problem {#toc-hId-1873575626}
=============================

Atlassian has decided that everyone needs to log on with their Atlassian account when starting SourceTree for the first time. More information over at the [SourceTree Blog](https://blog.sourcetreeapp.com/2016/02/22/sourcetree-update-atlassian-account-git-lfs-support-ui-refresh-and-more/).

Oh, and they decided that the smart thing to do was push the Windows version with debugging files (.pdb)!

Download the fix {#toc-hId--678581335}
======================================

You can still download the 1.7.0-version from Atlassian, from here:

<http://downloads.atlassian.com/software/sourcetree/windows/SourceTreeSetup_1.7.0.32509.exe>

PS. Thanks [Chocolatey](https://chocolatey.org/packages/SourceTree/1.7.0.32509)for pointing out where to find old versions of SourceTree.

comments: author: mklemarczyk
body: I think it's only acceptable option.


Tags: install

licence

startup

windows
How can I do something like git checkout --track origin/newBranch
Asked by Seajean Yeung:

I use git pull, git checkout --track origin/newBranch a lot, but in sourceTree, I can not find a quick way to do this, So how can I do it.

PS: I don't like to use track remote and select the remote branch to track, 'Cos there are many many branches in the remote and very hard to find the branch to track.


Answers:
author: Seth
body: In the "Checkout New Branch" dialog, check the "Local Branch should track remote branch" option.

image2016-2-25 8:15:11.png

If that isn't what you're looking for, maybe you could explain what you're trying to do more clearly.  
[](https://community.atlassian.com/t5/Sourcetree-questions/How-can-I-do-something-like-git-checkout-track-origin-newBranch/qaq-p/87739?attachment-id=11395){#link_11697d594c06c5}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/2520/1/image2016-2-25%208%3A15%3A11.png){#display_11697d594c06c5_0}
SourceTree 1.8 doesn't recognize system Git
Asked by Chase Sandmann:

I just upgraded to 1.8 and after logging in, every single repo popped up an error prompt with "git status failed with code -1." I looked this up and the results said that the problem was that SourceTree didn't recognize my system's git. But it worked just fine in 1.7! I have it in my Path environment variable, so I don't know what could possibly be the problem.

I don't give a crap about the graphical changes. I could take them or leave them - I honestly couldn't care less. But it's absolutely unacceptable to completely break AN INTEGRAL FUNCTIONALITY that worked perfectly in previous versions. I will be reverting to a previous version, and if Atlassian continues to ignore Windows users, I will discontinue using this product altogether.


Answers:
author: Jim Howe
body: I had the same issue. I uninstalled the 1.8 release and went back to 1.7. Unfortunately even the 1.7 version doesn't work as well as the 1.6.x release that I 'upgraded' from. I suspect some configuration information got lost in the process. I can view my repositories, but I can't push to the remotes. Very sorry that I 'upgraded'.


Tags: git

windows
Corporate license key / install for SourceTree 1.8 and above?
Asked by Alec McTavish:

(Discussed in part in <https://answers.atlassian.com/questions/37039953>)

All help topics on corporate licensing I could find (e.g. <https://confluence.atlassian.com/sourcetreekb/sourcetree-license-for-corporate-usage-388404078.html>, <https://confluence.atlassian.com/sourcetreekb/sourcetree-silent-installation-windows-732267345.html>) have the following message:

PAGE NO LONGER VALID WITH THE RELEASE OF SOURCETREE FOR MAC OSX 2.2 AND SOURCETREE FOR WINDOWS 1.8

Is there no longer a corporate license key option? I am a teacher, and would like to know what simple / valid / legal options (if any) I have for using SourceTree in my high school computer lab where our security system reimages computers every time they reboot (which, when all is working correctly, should be every night). Systems currently run Windows 7; will likely be Windows 10 starting this fall.

I really like SourceTree as a means by which students can learn how to utilize the broad scope of Git's functionality, but having each student have to get an Atlassian account (FERPA issues, among others) and click through the licensing process every time they log in after a reboot is unfortunately too much of a burden for this to be workable for my classes. I'm hoping there's a better way we could handle this setup!


Answers:
author: Jamus Jegier
body: I'd suggest everybody who is having issues with the new account requirements open up bug tickets in the support portal. There you will get a response, and hopefully you'll be able to talk to a product manger, explain your use cases, and get your voice heard.

comments: author: Prashant Pathak
body: I couldn't find out how to do this the first time because it was hidden away on the support site. Here's a direct link to report a SourceTree bug: <https://support.atlassian.com/servicedesk/customer/portal/1/create/4>


author: hischampion
body: I also wish for a licensing option that doesn't require internet access for each dev. Here's the link to the bug for this issue: <https://jira.atlassian.com/browse/SRCTREEWIN-4666>. *Please go there and vote for the bug if you want it fixed!*You can also watch the bug to get updates in your email.
How do I use SourceTree on a non-internet connected machine?
Asked by Andrew Ruddock:

Development machines are not all connected to the internet. After installation of SourceTree I have to "Log in to your Atlassian account", which I cannot do.

How do I use SourceTree on a machine not connected to the internet?


Answers:
author: Tim Crall
body: <https://answers.atlassian.com/questions/251569>
Updated to sourcetree 2.2.2 and can't get past the customer agreement / account login screen
Asked by Joshua Kelly:

Unfortunately i just get stuck on the following screen, it's locked up and when i quit i get an unexpected error message. OSX 10.11.3 and Sourcetree 2.2.2

Screenshot 2016-02-25 09.59.16.png

Any ideas?  
[](https://community.atlassian.com/t5/Sourcetree-questions/Updated-to-sourcetree-2-2-2-and-can-t-get-past-the-customer/qaq-p/30308?attachment-id=9738){#link_11733962c81567}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/889/1/Screenshot%202016-02-25%2009.59.16.png){#display_11733962c81567_0}


Answers:
author: frazras
body: Do not use the upgrade Just download a new install from the site. That worked for me


author: zhezhang
body: Here is my solution for now:

* go to application preference files folder located in\` \~/Library/Preferences\`

* delete SourceTree preference file called \`com.torusknot.SourceTreeNotMAS.plist\`

* restart your SourceTree app.

It will work.

comments: author: chrishales
body: Thank you! This solution worked for me.


author: Joshua Kelly
body: Unfortunately i don't have this file on my machine...


author: Nisse Bergman
body: This worked for me too


author: Joshua Kelly
body: Installed 1.7 again and this file appeared. Followed your steps and it's now working. Thanks mate!


author: Sharon Hinde
body: I had this problem and found I had to log in to my.atlassian.com in Safari (on mac - which is weird because I never use that browser) and then the login screen would load in Sourcetree and I could enter my details.


author: chrishales
body: I'm having the exact same issue.

Upgraded to 2.2.2 and went through the update and was asked to log into Atlassian. On that first run the app seemed to run okay. After however I can not get past the same screen as the OP. If I try to quit it crashes.

comments: author: Joshua Kelly
body: My exact issue mate. Worked perfectly the first time, now every time i try to start the application i get stuck here.


author: zhezhang
body: Same issue here! Really need a fix soon.


author: Steven Nash
body: The account login rejects my username/password on os x, without say why. Login details are fine in browsers
Lost staged files
Asked by Tyler Durden:

Yesterday, after a hard working - and satisfying - day, I was about to commit all my shit. But in the end I decided to leave it there and commit today. So I staged all my modifications. In the end, without I could tell why, SourceTree seemed to refuse to stage my last file, and seemed to hang...

This morning, I cannot find any of my earlier staged files. Neither in SourceTree nor in the directories on my hard drive ! All my modifications just vanished...

I'm using SourceTree 1.6.22 for a few days now, and I'm seriously considering to throw it away plain and simple. Has anyone any explanation for the fuck that happened to me, and if so, where are my modifications ???

I am a developper since quite some time and have been successfully working for years with CVS, SVN, HG, and GIT. Never had such a terrible experience with any source controlling program...

Best regards though


Answers:
author: Seth
body: I've never heard of that sort of behavior happening with SourceTree. The fact that modifications are missing from your working copy doesn't really make sense - staging shouldn't effect your working copy at all, just the Git index. I'm not doubting your account, just baffled as to what could have possibly gone wrong - SourceTree doesn't interact with your files except as a GUI wrapper for git commands.

1.6.22 - sounds like you are on Windows. Do you by chance have the feature turned on where Windows saves versions of files? If so, that might help recover your work.
can't start sourcetree after update
Asked by caroline kroko:

I chose the option to update Sourcetree, downloaded, and ran the install.

Now when I try to start (the new) Sourcetree I am redirected to the Atlassian website for licensing. The instructions on the website tell me to update the license from within Sourcetree. But when I try to get into Sourcetree, I get redirected to the website ... which tells me to update the license from within sourcetree ... but when I try to get into sourcetree, I get redirected to the website ... which tells me to update the license from within sourcetree ... but when I try to get into sourcetree, I get redirected to the website ... which tells me to update the license from within sourcetree ...

AND SO ON.


Answers:
author: augiesarmy
body: I am having the same problem. I am not getting redirected and SourceTree does not open. Did anybody find a resolution for this?


author: Jim Smith
body: Similar happened to me but I don't get redirected and SourceTree does not start. Using the latest version 1.8.3.

Here is the event viewer log:

Faulting application name: SourceTree.exe, version: 1.8.3.0, time stamp: 0x56f18db8  
Faulting module name: KERNELBASE.dll, version: 6.3.9600.18202, time stamp: 0x569e7eb1  
Exception code: 0xe0434352  
Fault offset: 0x0000000000008a5c  
Faulting process id: 0x275c  
Faulting application start time: 0x01d1869bf7d0e2e8  
Faulting application path: C:\\Program Files (x86)\\Atlassian\\SourceTree\\SourceTree.exe  
Faulting module path: C:\\Windows\\system32\\KERNELBASE.dll  
Report Id: 35a75704-f28f-11e5-82f2-a4c49423f4b4  
Faulting package full name:   
Faulting package-relative application ID:


author: Seth
body: What version of SourceTree are you installing? They implemented some fixes around this authentication in 1.8.2.1 and 1.8.2.2.


author: Nuno Duarte
body: Same happened to me...

[How to fix "Invalid CSRF token found in form body"?](https://answers.atlassian.com/questions/37036714)
SourceTree v1.8.2 on Windows -- what happened to the tree view option?
Asked by Thomas Brennan-Marquez:

Just loaded the update to v1.8.2 on Windows -- what happened to the tree view option? There is a checkbox to 'enable Tree View as a file listing option' but it doesn't seem to work. Please bring back the tree view. Great tool by the way. Thanks so much.


Answers:
author: james crump
body: Deal breaker for me. Any idea how to revert to older version?

comments: author: Seth
body: Search the site for SourceTree 1.8. There's a question about it with lots of votes that includes 1.7 download links in some of the answers.


author: james crump
body: Thanks! That did the trick.


author: Seth
body: Not sure why the option is still in there. The 1.8 release notes explicitly state that tree view was removed. I don't know the reason for sure, but I expect they were unable to resolve the significant performance issues that tree view caused for many users.
Sourcetree: Create HG Flow is not possible
Asked by Jon Uhlmann:

OK, the HG Flow Button is here again. But: If I try to create HG Flow in a fresh Repo, it doesn't work! My workmate have the same problem. I created a small video to show the behaviour:

hg-flow.gif

Please Atlassian, fix this!

Are there similar issues on git and / or on windows?  
[](https://community.atlassian.com/t5/Sourcetree-questions/Sourcetree-Create-HG-Flow-is-not-possible/qaq-p/242634?attachment-id=10026){#link_11697e2c8912a1}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/7102/1/hg-flow.gif){#display_11697e2c8912a1_0}  
[](https://community.atlassian.com/t5/Sourcetree-questions/Sourcetree-Create-HG-Flow-is-not-possible/qaq-p/242634?attachment-id=10027){#link_11697e2c8912a1_0}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/7102/2/HGFlow.mp4){#display_11697e2c8912a1_2}


Answers:
author: Jon Uhlmann
body: At the moment, downgrading (and turn of updates) seems to be the only solution...


author: Seth
body: And yes, people have been reporting problems with git flow in the latest versions of SourceTree for both operating systems.


author: Gerhard Pretorius
body: Same problem with me.. Ver 2.2 is a bad one.

Downgrade is your best option. Or install hg-flow.py an run it of the command line.


Tags: hg-flow

mac

mercurial
OK, I don't know why Atlassian calls 1.8 an upgrade. This is at best, a terrible beta test. Are there any problems with reinstalling 1.7 on Windows?
Asked by Nukezm:

Will reinstalling 1.7 cause any problems if I upgraded :question: to 1.8?


Answers:
author: njuice
body: If you get any errors, try also deleting the C:\\Users\\\[username\]\\AppData\\Local\\Atlassian folder. This will destroy all your settings, of course


author: Seth
body: If you uninstall 1.8 first, should be no problems. I've done it myself and haven't noticed anything.

Uninstalling SourceTree does not delete your repositories, and (for me) did not even delete the bookmarks for my repositories.
Google 2 step verification and source tree
Asked by Anthony Royal:

I dont seem to be able to login to Atlassian with source tree using a google account with 2 step verification.


Answers:
author: Surya Suluh
body: Got into the same situation since I don't think you can import the license file manually in 1.8 (at least I don't know how you can do it since it always prompt you to login).

I think the only workaround right now is to rollback to 1.7.


Tags: google
How can I set "Current Branch" to be the default in the Log View?
Asked by Joachim Fornallaz:

Every time I click on a branch in the sidebar, the popup on top of the Log View resets to "All Branches" which is super annoying.


Answers:
author: bgannin
body: This is not currently supported. Please file an ER on JIRA.atlassian.com under the SRCTREE project. Thanks!

comments: author: Joachim Fornallaz
body: <https://jira.atlassian.com/browse/SRCTREE-3560>
How to install sourcetree when installer is stuck in never ending loop
Asked by Rob Harkiss:

Before I start I would like to say I think sourcetree is a great application. I have just been having a few teething issues with source tree 1.8...

I have just downloaded the latest version of source tree in an attempt to get a version that has less bugs than the one I was using (I recently upgraded from 1.7 to 1.8.x). The install screen asks my to use an existing account or to Go to My Atlassian. I click to login using google, after putting in my login I get a page cannot be displayed error in the login window and it opens a link in chrome (my default browser) which gets a 403 error. Clicking go to my Atlassian button just takes me to my Atlassaian page and shows me my sourcetree licence and I can't do much from there.

So what do I do? I can't log in, I cant licence sourcetree and closing the installer and opening my old link to source tree just brings up the installer again. So basically I am completely stuck and unable to use SourceTree. I hope you can understand that I am seriously regretting upgrading to 1.8 as it has given me nothing but grief for very little (as far as I can see so far) additional functionality. I am not interested in a response, I just want a working source tree. Please change your installer to either work or allow the user to skip this step and licence the product after the install has completed. As you can probably gather, I find the current installer extremely frustrating.

Thanks again for supplying a great product!


Answers:
author: Seth
body: You might try this solution for installing a license offline: <https://answers.atlassian.com/questions/37039953>


author: Mark Lyon
body: Mostly same issue, IE behind firewall. Just downloaded today. Tried editing sourcetree.exe.config and copying license file, but no joy.


author: Seth
body: Rob, what specific SourceTree version are you having the error on (more specific than 1.8.x)?


author: geho
body: I'm having the same issue after upgrading to version 2.2 on Mac OS X
why does the spacebar no longer work to stage a file in sourcetree?
Asked by Tyler Waters:

In older versions of source tree, under Windows, I could select a file in the 'unstaged files' listbox and press spacebar to stage that file.

When I updated to 1.8.0 this seemed to have disappeared -- now only "CTRL+SHIFT+PLUS" does it, which is ... considerably more verbose. Also recently updated to 1.8.2 hoping it was fixed but no dice.

It would be really great if the spacebar worked for staging files.


Answers:
author: Peter Halverson
body: Nope, this handy shortcut disappeared with the 1.8 "upgrade". This, and many other disappointments with the new version, is why I reverted to 1.7.
Atlassian Authentication prevents me from starting sourcetree
Asked by Hamilton Lovemelt:

See attached screenshots... I cant get in because of a HTTP 403 ... and I cant find a way around this, Im on windows 10, and have tried an earlier version but in that version it does not even let me open terminal

sourcetreeissue1.PNGsourcetreeissue2.PNG  
[](https://community.atlassian.com/t5/Sourcetree-questions/Atlassian-Authentication-prevents-me-from-starting-sourcetree/qaq-p/126078?attachment-id=2970){#link_11697e9e43334d}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/3748/1/sourcetreeissue1.PNG){#display_11697e9e43334d_0}  
[](https://community.atlassian.com/t5/Sourcetree-questions/Atlassian-Authentication-prevents-me-from-starting-sourcetree/qaq-p/126078?attachment-id=2971){#link_11697e9e43334d_0}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/3748/2/sourcetreeissue2.PNG){#display_11697e9e43334d_2}


Answers:
author: Sharon Hinde
body: Try being logged into my.atlassian.com in the system default browser (Mac = Safari, Windows = IE or Edge) then doing the Sourcretree sign in. I couldn't get logged in to Sourcetree on my mac until I had signed in to my.atlassain in Safari, even though I never use that browser.


author: Hamilton Lovemelt
body: if I try to use the google route it says I cant because of cookies. Any help is greatly appreciated


author: Hamilton Lovemelt
body: I just tried with both and i have the same problem i uninstalled fully and then reinstalled on both


author: Seth
body: What version of SourceTree are you installing? They implemented some fixes around this authentication in 1.8.2.1 and 1.8.2.2.
Git flow commands not working: "git-flow completed with errors, see above"
Asked by sharabiania:

Ever since I upgraded to SourceTree 1.8.1.0, the git glow command fail with no detailed error message:

sourcetree.png

> sh.exe C:\\Users\\MyUserName\\AppData\\Local\\Atlassian\\SourceTree\\gitflow_local\\gitflow\\git-flow feature finish logs-overhaul  
> Completed with errors, see above.

It's says completed with errors, but there is no error message.

It happens when I Start a new feature or Finish a feature.  
[](https://community.atlassian.com/t5/Sourcetree-questions/Git-flow-commands-not-working-quot-git-flow-completed-with/qaq-p/439067?attachment-id=6706){#link_11697eb2cfb793}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/13147/1/sourcetree.png){#display_11697eb2cfb793_0}


Answers:
author: rehmetjan
body: i have same problem. it was never happened before until I upgrade to the new version 1.8.1.0

but I can use 'git flow' in command line. not 'git-flow', should be 'git flow'.


Tags: git

git-flow