youngmon/atlassian-qna huggingface dataset:
bug on version 2.1.11.0 too big commit message during merge conflict
Asked by Nyxhrim:

![sourcetree xD.gif](/t5/image/serverpage/image-id/22410i210CED8736D22A29/image-size/large?v=v2&px=999 "sourcetree xD.gif")


Answers:
author: minnsey
body: Hi  

I'm afraid that is a known, long standing, bug you've found there, see <https://jira.atlassian.com/browse/SRCTREEWIN-6722>
Login issue with Source tree app
Asked by Nithin Thomas:

Hi,

[nithin.thomas@staples.com](mailto:adam.berkowitz@staples.com) is my email address.

When I am on a particular server, I am able to login to sourcetree via the IE 11 browser. But when I am in the sourcetree app (v 2.5.13) and use the same credentials, I am unable to login to it ('something went wrong when attempting to validate your credentials' is the error message I am getting).

Can you help?

Perhaps there is a port in the app that my server needs to have opened or something?

Please advise.


Answers:
author: minnsey
body: Hi  

It sounds like you are on Windows, referring to IE, but I'm guessing the version number is a typo, the current release is 2.5.5.  

Are you trying to register, during the welcome wizard, or add a new account? Are you trying to use a Bitbucket, Bitbucket Server or Atlassian account ?

comments: author: Nithin Thomas
body: ![Source Tree Step 1.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/22605iA9173DDF1CCD0A03/image-size/large?v=v2&px=999 "Source Tree Step 1.jpg")![Source Tree Step 2.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/22606iA4077A265AEA9617/image-size/large?v=v2&px=999 "Source Tree Step 2.jpg")

Hi Michael,

Yes you are right it is v2.5.5

In the Register Account wizard I'm selecting Atlassian account and providing my credentials which is already registered.

Please see attached screenshots.


author: Nithin Thomas
body: Can some one help to resolve this issue please?


author: minnsey
body: Please try the following:  

1. open Internet Explorer
2. open the Developer tools, f12
   1. set the Browser Mode 10
   2. set the Document Mode Standards
3. open Cog/Internet options
   1. ensure the following settings are enabled
   2. Misc/Access data sources across domains
   3. Misc/Allow META_REFRESH
   4. Scripting/Active Scripting

The easiest way to test is to see if you can login to <https://id.atlassian.com> using Internet Explorer, if you can you should be able to use the Atlassian account registration flow, if you can't then try the settings above and retry.


author: Nithin Thomas
body: Hi Michael,

I was able to login to [https://id.atlassian.com](https://id.atlassian.com/?_ga=2.114367303.1971792864.1528181970-1594765655.1528181970) using IE 11 browser, but Atlassian account registration flow through Source tree complains that there is an error in validating the credentials.

I have also followed your steps and made necessary changes in IE 11 Internet option settings, still no luck.

Please help.


author: Martin K
body: I Have the same Problem with verison 2.6.9

id.atlassian.com login works (with IE 11), but not with sourcetree


author: minnsey
body: I'm sorry you are still experiencing issues with this.  

The best advice I can give at this time is to be a little patient. We are working on revisions to this process for the next release and this should solve this issue for you.
How do I revert a pull request?
Asked by roi_holtzman:

I've made a branch on one machine (call it the 1st machine) and then pushed my commits to the online server. Then I performed a \`pull\` request from a 2nd machine. On the 2nd machine I only had one master branch. I got that all the changes in my new branch are merged into my master branch. I did not expect this. I wanted to have the new branch on the 2nd machine as well.

I now see that I should have done "fetch" instead of "pull". The question is, how do I invert this pull request?

BTW, I saw the answer [here](https://community.atlassian.com/t5/Sourcetree-questions/How-do-I-revert-a-pull-request/qaq-p/197597), but I don't see a \`Reset...\` option when clicking on the last commit of master.


Answers:
author: Mikael Sandberg
body: You have to click on the commit you want to reset to, then you should see the option. You can also reset from the command line by using git reset --hard \<commit to reset to\>, or if you have not pushed your changes back to the remote master, you can use git reset --hard origin/master

In order to see new branches created on the remote you need to do a fetch in order to update your local repository. Doing a pull will not fetch any new branches, it will only fetch changes made on your current branch and then merge it.

comments: author: roi_holtzman
body: [@Mikael Sandberg](/t5/user/viewprofilepage/user-id/853579) Thanks. Do I need to choose the "hard" option when choosing to reset? It will not delete what I have on the server, right?


author: Mikael Sandberg
body: Hard will reset the index and working tree, meaning if you have made any local changes on master that has not been pushed to your remote, those will be deleted.


author: roi_holtzman
body: [@Mikael Sandberg](/t5/user/viewprofilepage/user-id/853579) I did this, and indeed it works. In the history view I still see the latest commit I did by mistake, but the files are reverted.

Now, I did fetch, but I don't see the new branch in my 2nd machine. Why is that?


author: Mikael Sandberg
body: Did you check under Remotes \> Origin?

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

You can also run git branch -r to list all the remote branches that your local repository knows about.


author: roi_holtzman
body: [@Mikael Sandberg](/t5/user/viewprofilepage/user-id/853579) I see it under Remotes \> Origin.

How do I put it in my local stuff?


author: Mikael Sandberg
body: Right-click on it and select Checkout origin/..., that will bring up the checkout branch screen and from there you just select OK and it will create a local copy of the branch and setup the link to the remote branch.


author: roi_holtzman
body: [@Mikael Sandberg](/t5/user/viewprofilepage/user-id/853579) Got it!

Thanks a lot!!
Sourcetree Security Questions
Asked by eight-arm-code:

Hello,

I'm working on a business case to bring in SourceTree on a project for visualizing local git repos/branches, and for that purpose I need answers to some security questions. I've done some research online, but I was hoping to get a more official response direct from Atlassian.

1. What is the purpose of the required login? I found this question asked in your community forum, but it did not have an accepted answer.
2. Can it be configured to use non-cloud-based Git repos such as Gogs, Gitea, or possibly SVN?
3. What data does it collect? Does it store **any** of the code from the repositories it is managing?
4. Can you share which open source components you might be using under the hood? This will help in the process of vetting the tool's security protocols.

Thanks in advance for your time and attention regarding this matter,

KE Chilton


Answers:
author: Ana Retamal
body: Hi! Even if it's not accepted it doesn't mean it's not correct, it just means the author of the question didn't go back to the question and click on the button.

1. I guess you're referring to the registration, that's to comply with our EULA, you can find it at [Atlassian Customer Agreement](https://www.atlassian.com/legal/customer-agreement?_ga=2.128695692.1413259901.1528098798-764984710.1492455458).

2. You can use it with any Git or Hg repos, but not SVN. Git and Hg repos can be used as far as you have access to them (they can be in the Cloud, or they can be stored locally on your computer).

3. For analytics we collect usage statistics, e.g. button clicks, and configuration statistics counts of git/hg repositories used, counts of Bitbucket/GitHub/Bitbucket Server accounts etc. It is all anonymous and the user can opt out of it. For (E-)MAU we collect anonymous installation information.

Sourcetree does not independently store any of the code from a repository, that is all managed by Git/Hg. Sourcetree does create and manage some additional meta data, held in a *sourcetreeconfig* file in the .git or .hg folder of a repository, but this is only ever stored on the local machine.

4. Components are listed in the Help/About dialog.

Hope that helps!

Ana
SourceTree does not launch
Asked by Jerry Harlow:

SourceTree for Windows is not launching for me starting today. There was no update done prior to me attempting to launch SourceTree. However, it appears SourceTree is trying to perform an update as it is launching A window pops up saying "Downloading file ... Downloading from <https://downloads.atlassian.com/software/sourcetree/windows/mcmw-v1.11.89.zip>..." This window goes away quickly, then nothing happens after that.

I checked the SourceTree.Log for today, and I see just this:

ERROR \[2018-05-17 11:50:41,654\] \[1\] \[SourceTree.AppRoot+\<OnStartup\>d__33\] \[MoveNext\] - Preflight checks failed! Continuing to run SourceTree


Answers:
author: minnsey
body: Hi  

There is a minor bug related to the download, it installs an authentication component for Mercurial usage and it currently runs too often, i.e. it should only run once and from then on detect that it has worked and not run again.  

However that should not prevent Sourcetree from starting.  

As you are seeing that popup Sourcetree is starting, but then apparently nothing after that. Is there nothing else in the log files?

comments: author: Jerry Harlow
body: There are a number of entries prior to today, but that is the only entry for today.

Also, a side note. The Atlassian Support web page suggests I download an update. But the link provided returns a 404:

<https://downloads.atlassian.com/software/sourcetree/windows/ga/SourcetreeSetup-2.0.19.1.exe>


author: minnsey
body: Can you tell me where you saw that URL? It points to a very old version, you can get the latest from [https://sourcetreeapp.com](https://sourcetreeapp.com?)


author: Jerry Harlow
body: <https://support.atlassian.com/contact/#/>

Select:  
Technical issues and bugs  
Sourcetree

You will then see:

Get the latest Sourcetree bug fixes and improvements

with the option:

Download the latest version for Windows


author: Jerry Harlow
body: Downloading the app (using your link) fixed my problem.


author: Niyati Khandelwal
body: For me, it is still not launching.
I can login on the web to my bitbucket and atlassian accounts but not through sourcetree
Asked by Tom Smith:

I can log in on the web to my bitbucket and atlassian accounts but not through sourcetree.

I have tried resetting my password but still no luck.


Answers:
author: minnsey
body: Hi  

If you are using Sourcetree for Windows can you try logging to <https://id.atlassian.com> using Internet Explorer?  

The component we use relies on IE and its settings underneath, so if you *can* login in directly via IE you should be good in Sourcetree, but it you can't Sourcetree will be blocked too.  

If you can't please try the following:  

1. open Internet Explorer
2. open the Developer tools, f12
   1. set the Browser Mode 10
   2. set the Document Mode Standards
3. open Cog/Internet options
   1. ensure the following settings are enabled
   2. Misc/Access data sources across domains
   3. Misc/Allow META_REFRESH
   4. Scripting/Active Scripting


Tags: bitbucket

login
Pull Request Issues - Missing code changes
Asked by Munesh Jadoun:

I have a master development branch, from which 2 resources have taken up 2 tasks. Resource A has completed his task and has merged his task to the main trunk. Resource B still is continuing his work. He sees that there is a pull request available to pull the work of Resource A.

Somehow this pull request doesn't seem to pull the required changes. Please advise the following:

- Are these specific settings/configuration/checklist items that I need to be aware of in such scenarios?

- Are there defined best practices that we can review to ensure that we don't hit upon any issues?


Answers:
author: minnsey
body: Hi  

Are both your Resources working on the same master branch?

comments: author: Munesh Jadoun
body: They are working on their own branches which were created from the master branch.


author: minnsey
body: Apologies if I've misunderstood, but Resource B will only be able to see the changes made by Resource A if either

* Resource A's changes have been merged to master and Resource B is looking at master
* Resource B is looking at Resource A's branch

If they have not been merged then to see the other Resource's branch and their changes they would each need to check out the other one's branch  

There is some additional information here

* <https://www.atlassian.com/git/tutorials/using-branches>
* <https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow>


Tags: merge

pull-request
Conflict dailog does not display, I tried to edit the SuppressConflictsWarning but can't find it
Asked by Richard Irwin:

I've seen posts on where the config file is to set the SuppressConflictsWarning

But when I open the config file the setting is not there

Seriously if you can click on a check box to nut show this dialog again (and why would anybody even want to do this?) then there should be something in the settings to turn it back on  


Answers:
author: minnsey
body: Hi  

On Sourcetree for Windows the setting is written to the user.config file.  

It can be a bit tricky to find, it will be under the following folder  

%localappdata%\\Atlassian\\Sourcetree\\Sourcetree.exe_url_{hash}\\{version}  

where {version} matches the version of Sourcetree you are running and then you are looking for this:  

\<setting name="SuppressConflictsWarning" serializeAs="String"\>  
\<value\>True\</value\>  
\</setting\>  

and you want to set it to False.

comments: author: Richard Irwin
body: Please read my posts more carefully:

"I've seen posts on where the config file is to set the SuppressConflictsWarning

But when I open the config file the setting is not there"

the xml

\<setting name="SuppressConflictsWarning" serializeAs="String"\>  
\<value\>True\</value\>  
\</setting\>

Does not exist in that file, should I add it?


author: minnsey
body: It is possible you have found a bug.  

Checking that checkbox in the dialog, should set the SuppressConflictsWarning = true and it will only be persisted across re-starts if it is saved to the user.config, The default is SuppressConflictsWarning = false.  

You can add that entry to the user.config and that should force to show (false) or not (true)
How can I stage hunks on a UTF-8 file with BOM?
Asked by coxymla:

I have a bunch of files that are UTF-8 with BOM. Not sure whether it matters, but they have file extension .rdl

I have added

```
*.rdl diff
```

To my .gitattributes file and restarted SourceTree to no avail.

Diff pane says "No changes in this file have been detected, or it is a binary file".


Answers:
author: coxymla
body: I updated my SourceTree to 2.5.5.0 and the issue has been fixed.


author: minnsey
body: Hi  

I've not been able to reproduce the problem, are you able to attach a file that exhibits the problem?

comments: author: coxymla
body: Thanks, I updated my SourceTree to confirm and it works now.
SourceTree?Clone??????GitHub???
Asked by yamashirotakashi:

SourceTree??????????2.5.5.0???????GitHub???clone????????URL???????

???????????????????URL????????????

??????clone??????????

?Bitbucket???????????clone??????

??????????????????????????????????????


Answers:
author: Ai Hirama
body: ???????????????????????????????

??????????????

??Windows??????????????Github??????????????????????????????????

????????URL???????????????????????????????????????????????????????????????????????????


Tags: language-ja

windows
Why am I not been able to login to Source tree Atlassian account with my registered mail id?
Asked by Nisha Thakral:

Hi,

I am not able to login to Source tree Atlassian account with my registered mail id.

Eventhough i am giving correct credentials !


Answers:
author: minnsey
body: Hi  

If this is on Windows, I am assuming you are being shown the web view of the Atlassian account login screen but you are unable to get past this point?  

If so can you check if you can login to <https://id.atlassian.com> using Internet Explorer? The Web view component used relies on Internet Explorer and its settings.  

If you can't can you check the following settings:

1. open Internet Explorer
2. open the Developer tools, f12
   1. set the Browser Mode 10
   2. set the Document Mode Standards
3. open Cog/Internet options
   1. ensure the following settings are enabled
   2. Misc/Access data sources across domains
   3. Misc/Allow META_REFRESH
   4. Scripting/Active Scripting

comments: author: Nisha Thakral
body: Yes it was on window 10 but i resolved this problem simply by deleting login credential file.

Thanks for your suggestion!
Can I use Sourece Tree for profitable use?
Asked by Ravee Kumar:

Can I use Source Tree for profitable use? Like developing the code and storing the codes in local repository and developing my products and selling.


Answers:
author: Ana Retamal
body: Hi Ravee, welcome to the Atlassian Community! Yes, you can do that, you can sell the products that you develop with the help of our software :)

If you have any other questions, let us know.

Enjoy Sourcetree!
How to prevent a file from being committed to one branch but included in the commit for another?
Asked by Cynthia Sheek:

We have a cert file that belongs in our development area and we don't want to push it up to our production area. We have separate branches for each area. There is actually a cert file also for the production area. So every time we commit from our development area to our production are the dev cert gets included in the production area and it causes issues. Is there a way to have the dev cert belong to the dev branches (we have a dev, qa, and staging branch for each environment) and the prod cert belong only to the production branch ?

Any ideas or suggestions would be greatly appreciated!


Answers:
author: Mike Corsaro
body: Hello! This should be possible using .gitattributes. I assume your workflow is to merge from dev to prod? If so, [you can use something like this to achieve that](https://stackoverflow.com/a/3970442).

comments: author: Cynthia Sheek
body: We actually have three development environments that use the same sandbox SSL cert (required by a third-party API) and it is only one file that needs to remain on those servers. A different SSL cert is used by the production version of the API. THe cert shouldn't change very frequently. We simply want to keep the cert files in the right location but don't want to commit them every time. Right now we have to commit the prod cert separately to the repo after releasing code in order to keep the API working, because the sandbox version of the cert keeps getting committed with pushes to the dev branches. Don't know how to fix this.
Deleting binary from Repo
Asked by Michael Wojtowicz:

Development team included a large zip file in their repositories and wants to get rid of this file so that any future clones do not receive this file. Its been happening for months so there will be a lot to clean up. Any recommendations on best path to resolve ?


Answers:
author: Vladimir Filippov
body: Hi!

Try to use "filter-branch"

```
git filter-branch --tree-filter 'rm -f ./YourLargeFile.zip' HEAD
```

**WARNING** ! The rewritten history will have different object names for all the objects and will not converge with the original branch.

for more information see: <https://git-scm.com/docs/git-filter-branch>

comments: author: Michael Wojtowicz
body: This needs to be done on the local repo? Is there a way to do in on the bitbucket server itself? This is a very active repo.


Tags: bitbucket

file

remove

repository
Valid password doesn't work in SourceTree client
Asked by Dan Gehlhaar:

I cannot authenticate in the SourceTree client (2.4.8.0; I cannot install later version due to .NET issues) using a valid Atlassian email and password pair. I can log into the web site just fine using the same credentials. Any help? I filed a bug report but it has gone unanswered.


Answers:
author: Ana Retamal
body: Hi Dan, welcome to the Atlassian Community :)

What kind of error do you get? Can you send us a screenshot?

Also, can you have a look at the logs and let us know if you find some more info there? You can find them at [Sourcetree logfile location](https://confluence.atlassian.com/sourcetreekb/sourcetree-logfile-location-675384748.html).

Cheers,

Ana

comments: author: Dan Gehlhaar
body: Thanks for the detailed reply. The log file reports the following error on each authentication attempt: "ERROR \[2018-05-16 09:47:44,616\] \[1\] \[SourceTree.App\] \[.ctor\] - finish EnsureSquirrelExecutionStubIsCopied"

Apparently there is a problem with the squirrels?

I have attached a screenshot, it is not particularly insightful.![Atlassian.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/22223iABEF5636B9B91210/image-size/large?v=v2&px=999 "Atlassian.jpg")


Tags: authentication

client
How can i change language in SourceTree?
Asked by migs911:

Hello. How can i change language of interface in SourceTree for MacOS version?


Answers:
author: louisdj
body: Hi [@migs911](/t5/user/viewprofilepage/user-id/1183715)

Open SOurceTree, go to the left upper corner, click 'Sourcetree', choose 'Preferences' and change the language:

![Screen Shot 2018-05-15 at 19.51.44.png](https://community.atlassian.com/t5/image/serverpage/image-id/22123i72EA290ABC099352/image-size/large?v=v2&px=999 "Screen Shot 2018-05-15 at 19.51.44.png")

comments: author: Jo?o Bosco
body: Thanks!


author: migs911
body: The problem was deeper. I couldn't find "Preferences" button, because it was translated on Russian too bad.  
"Preferences..." should be translated as "?????????...", but it was translated as "????????????..."


Tags: language

mac
Fix a detached head / lost master branch?
Asked by marekka:

I can not see the master branch on my local repo, what is the reason?

<http://prntscr.com/jhqj5t>


Answers:
author: minnsey
body: Hi  

My initial guess would be that you initially cloned that branch specifically, so master has never been checked out?  

If you checkout master you should see it in the local branch list.


author: marekka
body: Yes! :)
Sourcetree: Not showing up the gitflow actions
Asked by Sumsam:

I am currently on a feature branch and want to finish this feature. I used to do that without any problem using the gitflow button and it showed up the actions that i can do. But now when i click on the gitflow button it shows me the below attached picture. I don't know why suddenly source tree has started showing me this instead of the actions that I need to do. I think source tree thinks there is no repository but there is and i am able to push to that repository within the same feature branch. But I am not able to finish that feature or create a new branch meaning I can't do gitflow actions.

P.S I am not sure if this is related but I recently added another repository inside source tree and now i have two repositories. And I think that might have to do something with what I am experiencing but it doesn't make any sense.

![gitflow.PNG](/t5/image/serverpage/image-id/21981i2C03AE6BA2FEEE3C/image-size/large?v=v2&px=999 "gitflow.PNG")


Answers:
author: Manju
body: This looks more like a windows screenshot. Removing Mac label.