youngmon/atlassian-qna huggingface dataset:
How to find out which file SourceTree takes exactly as Base, Local, Remote and Backup ?
Asked by A. Cemal ?zl?k:

When merging operation is called, temporary files are created in the project folder that was checked out such as BASE, LOCAL, REMOTE and BACKUP.

How to find out which commits SourceTree takes exactly for Base, Local, Remote and Backup ?


Answers:
author: Mikael Sandberg
body: Hi Ali,

And welcome to the Atlassian Community.

BASE is the common ancestor before there where any changes to the file on either side.  
LOCAL is your side of the conflict, e.i. your changes made to the file.  
REMOTE is "theirs" side of the conflict, e.i. changes made on the branch you are merging from.  
BACKUP is what the file looked like before you invoked the merge tool.

You can find out the base commit by using [git merge-base](https://git-scm.com/docs/git-merge-base) and feed it with the commit on your branch and the commit on the branch you are merging to.

comments: author: A. Cemal ?zl?k
body: Hello Mikael,

thank you for your reply, it helped much indeed. Do you know how to find out which base git is taking in a specific merge session when git merge ....... command is called?

Thanks.

Regards, Cemal.


author: Mikael Sandberg
body: Cemal, the git merge-base command I linked to above should be able to tell you what the base commit is. It will figure out the common ancestor.


author: A. Cemal ?zl?k
body: Mikael, thank you. The command does really return a commit, however, when I merge I get a 1KB base file which is practically empty and the returned commit is not empty, it is a file over 100 MB big. I have this related [question.](https://community.atlassian.com/t5/Questions/Sourcetree-creates-1KB-BASE-file-while-merging/qaq-p/817865?utm_campaign=&utm_content=post&utm_medium=email&utm_source=atlcomm#M60300) So I was wondering, if there is a way to get the base commit in a current merge operation beyond the one returned by the command or why does merge retrieve an empty base, although the returned base by the command is a "big" file ?


author: Mikael Sandberg
body: I believe it depends on what diff/merge tool you are using and how it is using the BASE file. I have seen some tools that only stores a reference to the common ancestor, looks like that is the case here.


author: A. Cemal ?zl?k
body: The point is it is not always the case that in the merge process a 1KB BASE file is created. For merge with some other branches it works fine as usual. I have this issue since a short time (Monday). Further, I tried to merge using git merge \<sourcebranch\> command and git mergetool command to merge and resolve conflicts, all without Sourcetree involved. Still the same problem.


Tags: merge
Source Tree prepends "heads/" prefix while finish hotfix
Asked by and-rew:

Hi,

when I attempt to finish hotfix Source Tree (v2.5.5.0) prepends to hotfix name "heads/". So it crashes because such branch does not exist

Output:

sh.exe path\\to\\Atlassian\\SourceTree\\gitflow_local\\gitflow\\git-flow hotfix finish -f path\\to\\Temp\\zwckkvmt.2cd heads/hotfix/hf5-test  
Fatal: Branch 'hotfix/heads/hotfix/hf5-test' does not exist and is required.  
Completed with errors, see above.

What's wrong? Is this a bug?

![2018-06-05 17_06_59-Sourcetree.png](/t5/image/serverpage/image-id/23824i866CA26B6F783B46/image-dimensions/443x269?v=v2 "2018-06-05 17_06_59-Sourcetree.png")


Answers:
author: Mike Corsaro
body: Hello! Could you try the latest version and see if this is still an issue? I'm unable to reproduce this issue on my machine.

<https://downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-2.6.3.exe>

comments: author: and-rew
body: Hi, Mike!

Obviously this issue is not depends on version. With the new one the problem still remain. Maybe I should clean some sort of temporary files, cache etc?

![2018-06-06 10_03_14-Sourcetree.png](https://community.atlassian.com/t5/image/serverpage/image-id/23876iF0D55ED747DED6A0/image-dimensions/355x234?v=v2 "2018-06-06 10_03_14-Sourcetree.png")


author: and-rew
body: But I guess it is a bug. While fetching a hotfix name in a dropdown-list on finish hotfix form, so it correlates with the path .git\\refs\\heads and does not process it correctly. Why are you couldn't reproduce this bug, so it may depends on temp files as I assumed above


author: and-rew
body: The problem still present in the newest version 3.0.12


author: martyvona
body: just happened to me with 3.3.8


author: martyvona
body: I think what happened is I had a tag with the same name as the branch. Once I deleted that tag the prepending of "heads/" stopped for the branch.


author: ??
body: [@martyvona](/t5/user/viewprofilepage/user-id/3858626) You saved me thanks!
Something went wrong while attempting to validate your credentials
Asked by Joey Potter:

Recently reimaged my laptop. Trying to install SourceTree Windows Version 1703 (OS Build 15063.877).

After trying to authenticate I receive "Something went wrong while attempting to validate your credentials" message. I can login to Atlassian.com just fine. I even reset my password. Still nothing...

Now here's whats funny. I can put a bogus ID/PWD and hit Log in, Same results!!!

One issue reported adding "AllowModifyConfigFIles" Value: True to the user.config file which I did and still having the same problem.

I've tried installing SourceTree 2.1.11.0 and 2.3.5.0 and have the exact same issue.

Please assist


Answers:
author: Ana Retamal
body: Hi Joey, welcome to the Atlassian Community!

Sourcetree relies on Internet Explorer for authentication, can you confirm that IE is updated to the latest version?

Also, in which step do you exactly get stuck? Is it during the registration? Or when you try to connect your Bitbucket account? Please send us a screenshot so we can help you better.

Kind regards,

Ana

comments: author: Joey Potter
body: Hi Ana

Yes I'm running Windows 10 IE 11 version 11.850.15063.0 Update Version: 11.0.50

During installation, After I select Atlassian Account and enter in my credentials I receive the error. I also noticed something in the sourcetree.log file that may be useful.

See attachments. ![SourceTreeLoginFailure.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/23809i6F44C106CDC57CDC/image-size/large?v=v2&px=999 "SourceTreeLoginFailure.PNG")![SourceTreeLogFileError.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/23810i7F0BE22E4D58EAE2/image-size/large?v=v2&px=999 "SourceTreeLogFileError.PNG")


author: Joey Potter
body: Ana: I've troubleshooted some more today.

Checked for login saved in Credentials Manager, Deleted the Atlassian folder out of AppData, Reset IE settings. Installed a version of SourceTree before my OS release. Nothing seems to work. Please delete my Atlassian account all together and send me an email its been done. I'll register again and try again..

Thanks.


Tags: bitbucket

bitbucket-server

server

windows
SourceTree remove remote branches options on push
Asked by chris del:

When I push a branch all the previous remotes I've pushed to show up, as if I would want to push my branch to all these remotes. How do I remove all of these options except for the one I want?

I've tried leaving the \`-\` sign, removing it, adding and removing the checkmarks. When I reopen this panel, all of these options are still there. How do I get it down to a single remote? And have it not remember all the previous remotes here?

![Screen Shot 2018-06-20 at 1.06.51 PM.png](https://community.atlassian.com/t5/image/serverpage/image-id/24998iA92FEB36C5D426DC/image-size/large?v=v2&px=999 "Screen Shot 2018-06-20 at 1.06.51 PM.png")

SourceTree remove remote branches options on push


Answers:
author: Manju
body: Are these local branches that haven't been pushed to remote? Or branches that are tracked but have local commits that need to upstream?

comments: author: chris del
body: They are local branches, with their own remotes, with no current un-pushed local changes. Both local and remotes are still in use so I don't want to delete them.

If try and push from say develop to its remote, the prompt from the photo appears, with the remotes to all those other branches.


author: chris del
body: I have already accidentally push a branch to the wrong remote because of this
Link an existing GIT branch on a remote repo. to an existing folder
Asked by John Voigt:

Ok, this is a similar question to [https://community.atlassian.com/t5/Sourcetree-questions/How-to-create-a-GIT-repository-in-existing-folder-full-of-files/qaq-p/264461](https://community.atlassian.com/t5/Sourcetree-questions/How-to-create-a-GIT-repository-in-existing-folder-full-of-files/qaq-p/264461?) but yet a bit different.

Here is the scenario. A have an existing directory on my computer that has existing files in it. This directory is not under GIT control at all now. I want to associate this folder to an existing remote branch (B1) on an existing remote repo (RemRepo1).

I was wondering how I would do this with sourcetree. I am suspecting that you can't use the wizard how you create a sourcetree project and you would have to do some bash commands like first GIT init the folder to make a local repo and somehow go from there but I am not sure how - or with luck if there is a simpler way. The directory (and the remote existing repo branch) is rather large so checking out that whole remote repo and branch in one place and pasting all the code into it might not be ideal but I am open to whatever I need to do to best accomplish this.


Answers:
author: Manju
body: I'm afraid its not possible to achieve this without having the repository locally on disk. My recommendation is to clone the repo and checkout the branch you need. Then, move the directory to the location you need, add all the new files in Sourcetree to be tracked and you are good to commit and push.


Tags: git

remote

repository
How can I hide merged branches from SourceTree graph?
Asked by Ben Thomas:

We use git flow, so we do work in feature branches, and we maintain release branches too. When they're finished, they get merged back into \`develop\`.

Over the past 12 months, about 20 branches have been merged into \`develop\`, so the graph is getting pretty hard to read - basically useless. See the attached screenshot.

Is there any way to hide the merged branches, but still see unmerged branches?

![Screen Shot 2018-06-04 at 08.51.06.png](https://community.atlassian.com/t5/image/serverpage/image-id/23570i8DF63A08F4251E8F/image-size/large?v=v2&px=999 "Screen Shot 2018-06-04 at 08.51.06.png")


Answers:
author: Manju
body: ![](blob:https://community.atlassian.com/9ea1ee92-649d-4ccf-ab7c-810b72db8d28)

There is an option to select the current branch or any individual branch if you want a filtered graph and history. Does that help?

comments: author: nneitzke
body: I know this is old, but that doesn't help at all. The reason being is that hides all branches. If I understand the parent correctly (and my needs), we want to hide only merged branches but still show all unmerged branches in the graph.

It's really frustrating because I love source tree (especially because of this beautiful graph feature). But when you have a bunch of merged in feature branches that are no longer relevant it becomes useless.


Tags: merge
After update to 2.6.3.0 "Fatal: cannot use . as an exclude file"
Asked by Vivien:

I keep getting this error when opening any repository after updating to the newest version of Sourcetree (on Win 10):

![2018-06-03 16_59_42-Sourcetree.png](/t5/image/serverpage/image-id/23566i315A927587A84DD8/image-size/large?v=v2&px=999 "2018-06-03 16_59_42-Sourcetree.png")

I am even getting the error after cloning an empty Bitbucket repository. It's exactly the same error for every repository I open. I can close the error message but not push or pull any changes with a similar error message:
> warning: unable to access '.': Permission denied  
> fatal: cannot use . as an exclude file

Can somebody please help with this?

----

Addition:

I tried uninstalling and deleting all preferences, then reinstalling the older version 2.5.5.0 (which funny enough is the newest version you can download from atlassian.com). But the error still appears.


Answers:
author: Vivien
body: Fixed: I updated Git, as suggested to v2.17 (as was required with the new Sourcetree version), but forgot to point Sourcetree to the system Git installation. So I guess it was caused by an old Git version...

comments: author: KiwiLee
body: I had the same problem today.

The actual solution is to blank out the field Global Ignore List or select a .gitignore that is relevant to your use.

You would have had a rogue . in this field.

**Menu:** Tools - Options and click the Git tab.

Lee.


Tags: error

update
How can I install the SourceTree
Asked by bru_sia:

Hi all.

I have a problem. Trying to install sourceTree on Windows it breaks with that:

"Log in with Atlassian account JavaScript load error

We tried to load scripts but something went wrong.

Please make sure that your network settings allow you to download scripts from the following domain:

**<https://common-admin-cdn.atlassian.com/atlassian-id/front-end/2.5.24>"**

On the domain I see:

**AccessDenied**

What should I do? How can I fix it and get the access? Is there any solution?


Answers:
author: Ana Retamal
body: Hi! This is usually caused by an old version of the browser. Sourcetree relies on Internet Explorer for authentication, can you make sure it's updated to the latest version?

Apart from that, IE needs to be configured at a minimum as follows:

- Cog/Internet options/Security settings need to be enabled

- Misc/Access data sources across domains

- Misc/Allow META-REFRESH

- Scripting/Active Scripting

- The browser mode set to 10

- The document mode set to 10

These can be set using the F12 developer tools.

Those are the settings that matter. It should also be able to set them indirectly by:

- making sure [https://id.atlassian.com](https://id.atlassian.com/) is NOT set to be rendered in Compatibility Mode

- Set Cog/Internet options/Security to Medium-High

Let us know if this helped you!

Best regards,

Ana

comments: author: bru_sia
body: I recheck settings you give. It was all corect.

Ufortunately, problem is still the same.


Tags: windows
Is it me or is Sourcetree getting Worse - Cannot see any Repositories
Asked by Mark Anderson:

I have just reluctantly upgraded to 1.x to 2.5

All my Repositories have disappeared, I cannot see any projects. Only one that I had open last night.

There is no full list down the left hand side as originally seen and I cannot seem to find a way to get that back ?

thanks


Answers:
author: minnsey
body: Hi  

The listing of local repositories, or bookmarks, is now in the *local* section of he *New Tab.*
How so set terminal to open with admin rights in windows
Asked by dissident-penguin:

Hi everybody,

this is my first interaction with the forum. Sorry if this is a noob question, but would like to know how to set the "terminal" button in sourcetree to open powershell with admin rights? I know I can do that if I browse to the binary and open it with admin rights manually, but it would be super convenient to be able to do it form sourcetree. Thanks!


Answers:
author: Mike Corsaro
body: Hello! Unfortunately this is not supported. However, you can always configure a custom action (Tools \> Options \> Custom Actions) to do this for you.
I cannot log on
Asked by Agnieszka Zaj?c:

Hi,

I cannot log in in Application SourceTree. I tried versions:

2.2.4.0, 2.4.8.0 , 2.1.10.0 , 2.1.2.5, 1.9.9.20, 2.5.

I'm getting an error: Something went wrong while attempting to validate your credentials.

But with the same login and passwort i can log in on webside atlassian.com

Could you help me?

Best regards,

AZ


Answers:
author: Ana Retamal
body: Hi Agnieszka, welcome to the Atlassian Community!

Sourcetree relies on Internet Explorer for authentication, can you confirm IE is updated to the latest version?

If you're still having issues, please send us a screenshot so we can see where you are stuck, and also have a look at the logs to see if there's some additional information there. You can find them at

C:\\Users\\\<username\>\\AppData\\Local\\Atlassian\\SourceTree\\sourcetree.log

Let us know!

Kind regards,

Ana

comments: author: Agnieszka Zaj?c
body: Thank You Ana,

everything is working now. I found your answer about settings in IE, I did this on friday, and now ist everything ok. :-)

Best regards!

Aga


author: Ana Retamal
body: Glad to hear that, Aga!

Have a good day :)

Ana


author: vincent caffarello
body: I cannot log on to COnfluence it says my user id is not valid. It is my company email ID how can this be happening. I also received an email verification memo and clicked it
Git button Text Japanese Text is mistake
Asked by Aska_Koshi:

SourceTree / Option / Git

Git Version Up Button Text Japanese Text is mistake.

?? Mercurial??? -\> ?? Git ??? this text is correct.


Answers:
author: Ai Hirama
body: Thank you for reporting this! I raised the following bug ticket.

* [SRCTREEWIN-8749 Wrong Japanese translation in the UI](https://jira.atlassian.com/browse/SRCTREEWIN-8749)

I suggest adding yourself as a watcher and voting to the ticket. Also, please refer to our [Bug Fixing Policy](https://confluence.atlassian.com/support/atlassian-bug-fixing-policy-201294573.html).

If you need further help, let me know!


author: Danyal Iqbal
body: +1 for bug.


Tags: language-ja
Option to set the default branch to visualize
Asked by olivier rombauts:

Hi,

It would be nice if there would be an option to set the default branch type to show in the log/history tab. Currently this defaults to 'All branches'. On every restart of source tree or opening a new repo I need to set the branch type to show to 'Current branche', which is more applicable in my situation. Would it be possible to set this as an option. Could be global, or even on the level of the repo.

Success,

Olivier


Answers:
author: Manju
body: That sounds reasonable. Would you mind submitting this as a feature request on our public issue tracker - <https://jira.atlassian.com/projects/SRCTREE/>


Tags: branch
SourceTree Enterprise: "failed to check login for user"
Asked by Helen:

I installed SourceTree Enterprise and attempted to login to my local Bitbucket Server installation. The login fails with the message "failed to check login for user \[{username}\]".

The log has the following entries:  
ERROR \[timestamp\] \[1\] \[SourceTree.Exceptions.RemoteHostException\] \[.ctor\] - Insufficient authentication credentials  
ERROR \[timestamp\] \[1\] \[SourceTree.Exceptions.RemoteHostException\] \[.ctor\] - Failed to check login for user \[{username}\]

The root URL ( https://{server}.{domain}/{context}/ ), username and password are the same ones I use when successfully logging into Bitbucket in Internet Explorer on the same PC.

My username does not include any special characters such as the '@' symbol.

I have tried the suggestions in the following:  
<https://community.atlassian.com/t5/Sourcetree-questions/Getting-this-error-quot-Something-went-wrong-while-attempting-to/qaq-p/805220>  
<https://community.atlassian.com/t5/Sourcetree-questions/Looking-for-more-details-on-login-error/qaq-p/802237>

What additional authentication credentials am I supposed to provide, and how?

Software versions:  
- Windows 7 Enterprise  
- Internet Explorer 11.0.51  
- SourceTree Enterprise 2.5.5  
- .Net Framework 4.7.1


Answers:
author: Helen
body: Bug report here: <https://jira.atlassian.com/browse/SRCTREEWIN-8743>

comments: author: Helen
body: This bug report is now marked as resolved and should go into version 3.0.3!


author: Shusen Yi
body: I have the same problem. This this Oct 17, 2019. Almost a year passed still no answer.


author: James Griffin
body: I had the same issue, searched and tried many suggestion to resolve but none worked for me.

My problem was simple, but not immediately obvious - my username contained a space, eg. "John Smith". I changed my username in bitbucket server to just "John" and then I could login successfully with source tree.

If Bitbucket allows you to create a username with a space, and also login to bitbucket with a space in the username, source tree also should.


Tags: sourcetree-enterprise

windows
A bug - Japanese character corruption in Shift-jis files.
Asked by yuen yoshida:

Diff window doesn't show Japanese character correctly in Shift-jis file. And once I changed the default character set to UTF-8, diff window was fixed but commit logs became corrupted instead.

Please fix this! or tell me how can I avoid this.

![2018-06-01_09h01_19.png](/t5/image/serverpage/image-id/23421i6EAB50FB0632CF64/image-size/large?v=v2&px=999 "2018-06-01_09h01_19.png")


Answers:
author: Ai Hirama
body: Thank you for using the Atlassian Community!

I'm sorry to hear you're facing the problem. There's a known bug for the issue, tracked at the following:

* [SRCTREEWIN-6209 Japanese characters is garbled in diff view and cannot discard hunk/line with error](https://jira.atlassian.com/browse/SRCTREEWIN-6209)

Unfortunately, there are no available workarounds at the moment. I suggest voting and adding yourself as a watcher to the ticket above.

If you need further help, please let me know!


Tags: language-ja

character

diff
User login/App Links issue
Asked by Wayne Irvine:

I have been running Jira and Confluence on a Mac server for years and they were extremely out of date. I have been using the Jira internal database for authentication.

I recently went through an arduous process of updating to current versions (Jira 7.9.2, Confluence 6.9.0) and all looked good. Then for some unknown reason a user was unable to log into Confluence. I believe this has to do with Application Links and indeed App Links is reporting outgoing and incoming authentication disabled in both Jira and Confluence, but whenI try to make changes I get 'XXXX is not reachable.

<br />

<br />

In Confluence I have:

Application name: JIRA

Application URL: <http://jira.mydomain.com.au:8080>

Display URL: <http://jira.mydomain.com.au:8080>

For Connections:

Outgoing Outh -\> jira.mydomain.com.au JIRA Troubleshoot

Incoming Outh -\> jira.mydomain.com.au JIRA Troubleshoot

In Jira I have:

Application name: Confluence

Application URL: <http://confluence.mydomain.com.au:8090>

Display URL: <http://confluence.mydomain.com.au:8090>

For Connections:

Outgoing Outh -\> confluence.mydomain.com.au JIRA Troubleshoot

Incoming Outh -\> confluence.mydomain.com.au JIRA Troubleshoot

The domains are correct. Not sure about the application names or where they are set.


Answers:
author: Wayne Irvine
body: Seems Jira/Confluence has trouble with domain names. Tried '127.0.0.1:8090'.

**OAuth problem**

There is an issue with the OAuth configuration of the connection to [Confluence](http://127.0.0.1:8090/admin/listapplicationlinks.action).

    consumer_key_unknown

Correct. I have no idea what a consumer key is.  

comments: author: Wayne Irvine
body: I have updated all FQDNs to the actual IP address of the server and have them talking!

Strange that it Atlassian don't understand FQDNs.


author: Wayne Irvine
body: Ahhh, but that still doesn't correct the issue of authenticating a user in Confluence using Jira's database. :(


author: Wayne Irvine
body: Hmm, deleting the links and letting the software automatically rebuild them seems to work well but still doesn't allow authentication.


author: Wayne Irvine
body: Deleting and rebuilding the Jira User Server settings using IPs worked.  

<https://confluence.atlassian.com/doc/connecting-to-crowd-or-jira-for-user-management-229838465.html>


Tags: application-link

confluence

jira
I have troubles while installing
Asked by Nikita_Mednikov:

I am trying to install, I have an account, but I can't logged in during installation.  
I don't have troubles with access to my account on desktop.  

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


Answers:
author: Nikita_Mednikov
body: Download version 2.4.8.0 from this link <https://www.sourcetreeapp.com/download-archives>  
solved the problem