youngmon/atlassian-qna huggingface dataset:
Old File Versions Included into Commit
Asked by Wayne Hans:

User2 stages changes to one file, commits, then pushes to repo called "processes-user2". User2 creates pull request for User1 to review. While reviewing, User1 (me) realizes that commit includes other files that are a version old and should NOT be included.

1 - Why are these files (other than the one file that was staged) in the commit?

2 - What options do I have to exclude these? (Shouldn't I have the option to simply exclude these when merging (via SourceTree or BitBucket)?

3 - Is there paid support available that I would be able to explain my setup and ask what I'm doing wrong? I've been using this software for some time now and it still isn't behaving quite the way I understand despite viewing many tutorials.

Our setup includes 4 users (one of which is an admin). We have a central repo which only the admin has write access to. Then each user has their own repo with read/write access. My thought was that when a user makes a change to a file locally, they stage, commit, and push to their repo. Then create a pull request for admin, who reviews, then pushed changes to the central repo. Is this not the correct usage? If anyone can answer any of these questions, I'd greatly appreciate it.


Answers:
author: minnsey
body: Hi,  

I'm afraid its impossible to tell from here exactly why those apparently old files are included in the PR, but essentially it will be git determining that they are in some way 'newer' than the version in your central repo. I'm guessing you are effectively using forks of the central repository for each user.  

For what it is worth I believe you can achieve what you want with a simpler model, of just one repository, rather than each user having their own repo.  

If you have a single repository with, for example, the master branch being the one under strict control, then you can use Bitbucket's Branch Permissions to control who is allowed to merge changes to that controlled branch. <https://confluence.atlassian.com/bitbucketserver/using-branch-permissions-776639807.html>  

Each user can clone this single repository and then create feature branches for their work and commit/push/pull as they like then create PRs prior to merging back to the controlled branch.  

These PRs can have additional controls to ensure their quality, again via the branch permissions.
Sourcetree keeps asking username and password
Asked by Joe Tharayil:

Starting today Source Tree is not accepting my usernamd and password for GitHub and keeps showing the UI to enter credentials. . Because of this issue I cannot push/pull any change. I try to update "Update Embedded Git" but that didn't solve the problem. This issue happens on Terminal as well.

Version. 2.4.8


Answers:
author: Andrew Magill
body: The problem is that SourceTree's embedded Git client comes with git-credential-manager v1.12, which no longer works with Github since they disabled TLS 1.1 on their site. You need to get git-credential-manager v1.14. Easiest way to do that is to install a current copy of the Git client separately, and then switch SourceTree over to use that ("system git") instead of its embedded client. Alternatively, you can update git-credential-manager in your embedded client by replacing its files with the [newest version from Microsoft](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.14.0).

(This text is here just because the site doesn't allow me to post the same message in multiple threads, even when it's the answer to all of them.)

comments: author: Gemma McCombe
body: I'm having the same problem, I'm using System GIT already. Any other ideas?


Tags: git

windows
Source Authentication Stopped Working
Asked by Matt_Houser:

Problem:

- Sourcetree has stopped authenticating with GitHub. I cannot push, pull, etc.

- If I try to push/pull, one of 3 various username/password dialogs appear.

- Full output shows:

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin

Logon failed, use ctrl+c to cancel basic credential prompt.  
remote: Invalid username or password.  
fatal: Authentication failed for '<https://github.com/>...'

What did I do before this started:

- Source Tree: No changes to SourceTree were done by me. I pushed a change this morning and all was fine. This afternoon, any push/pull prompts with the username/password dialog (which 3 different ones appear at different times).

- GitHub: No security changes, only pushes, pulls, issue edits, etc.

My Sourcetree Configuration:

- I was using OAuth authentication

- Was using System Git (according to Options dialog). I never use command-line git on this computer (I have Sourcetree :) )

What Have I Tried to Fix This:

- Tried "Refresh OAuth Token". That succeeds and the Options dialog says "Authentication OK". But push/pull still has same problem.

- Tried changing to "Basic" and then "Refresh Password". My GitHub account uses MFA, so I use a GitHub "Access Token" as my password. Using that here, the Options dialog says "Login failed. Authentication failed for GitHub with username...". That very same Access Token works fine using command-line Git on my Linux computer.

- Uninstalled Sourcetree \& Git and reinstalled Sourcetree. During installation, I chose "Embedded Git". Problem continues.

My Computer Configuration

- Windows 10

- Sourcetree version: 2.4.8


Answers:
author: Andrew Magill
body: The problem is that SourceTree's embedded git client comes with git-crediential-manager v1.12, which no longer works now that Github has disabled TLS 1.1. Until they update the embedded git package, you'll have to switch to a system git client with git-credential-manager v1.14, or manually replace git-credential-manager in your embedded git client with v1.14. You can get the new version of git-credential-manager [from Microsoft's Github page](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.14.0). I just downloaded the ZIP and extracted it to C:\\Users\\USERNAME\\AppData\\Local\\SourceTree-Settings\\beta\\git_local\\mingw32\\libexec\\git-core, but your path my vary.

comments: author: Joseph Ficara
body: The suggestion from Andrew worked for me.

Note: My path was a slightly different:

C:\\Users\\USERNAME\\AppData\\Local\\Atlassian\\SourceTree\\git_local\\mingw32\\libexec\\git-core

Having SourceTree use System Git also worked with the latest git install from:

<https://git-scm.com/downloads>

Thanks Andrew!


author: venkatasai_ponnuru_kony_com
body: The solution worked for me.

Thanks Andrew.


author: devuxer
body: I ran into this today. In my case, creating a [Personal Access Token](https://github.com/settings/tokens)on GitHub and using that as my password instead of my actual password solved the problem. (I think this is necessary when you use two-factor authentication.)
Source tree suddently failing to authenticate with github
Asked by Joseph Ficara:

Early this afternoon 2/22/2018 source tree started failing to authenticate with git hub. I can authenticate via the terminal and via the website but when I try to issue a pull from source tree it prompts for login and re-prompts again and again after valid credentials are provided.

Finally it fails with errors indicating it can't authenticate.

I am running source tree 2.4.8.0 on Windows 10 professional.

Error message:

remote: Invalid username or password  
fatal: Authentication failed for

Joe


Answers:
author: Andrew Magill
body: See my answer [here](https://community.atlassian.com/t5/Sourcetree-questions/How-do-I-setup-Sourcetree-to-access-Github-now-that-they/qaq-p/735377#U735421).


author: Matt_Houser
body: I am having the \*\*exact same problem\*\*.

<https://community.atlassian.com/t5/Sourcetree-questions/Source-Authentication-Stopped-Working/qaq-p/735358>
Sourcetree support for TLS 1.2
Asked by Rob Skoog:

GitHub recently forced TLS version 1.2 and we seem to have trouble connecting to GitHub.

Is this something that is supported?

<https://githubengineering.com/crypto-removal-notice/>


Answers:
author: Andrew Magill
body: You just need git-credential-manager v1.14. SourceTree's embedded client comes with v1.12, which no longer works with Github. Easiest way to update is to install a current copy of the Git client separately, and then switch SourceTree over to use that ("system git") instead of its embedded client. Alternatively, you can update git-credential-manager in your embedded client by replacing its files with the [newest version from Microsoft](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.14.0).


author: John Ferguson
body: What resolved mine was downloading an up-to-date version of git and using that instead of the embedded version

<https://git-scm.com/downloads>


author: John Ferguson
body: Me too. Have tried enabling only TLS1.2 under Network in Options but still get

error:1407742E:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert protocol version

Is there a way to force it?

comments: author: John Ferguson
body: some progress being made on windows - see <https://forums.oscommerce.com/topic/412630-github-tls12-sourcetree-broken/>
SourceTree --allow-unrelated-histories
Asked by Mikki-10:

Do SourceTree have the function in the gui to --allow-unrelated-histories if yes there can i check it on? (i know it works in the terminal using the embedded git)


Answers:
author: bgannin
body: We don't have that functionality currently. Please vote on or file a ticket at <https://jira.atlassian.com/browse/SRCTREEWIN>.


Tags: git

windows
gitflow wrongly merge master back to develop while finishing hotfix or release
Asked by John Britto:

I'm facing problem while finishing hotfix or release branch. Gitflow merges the horfix or release to master and not to develop. Instead of merging hotfix or release back to develop, master branch is back merged to develop

Source tree version: 2.8.4

Embedded git: 2.15.1

sh.exe C:\\Users\\john\\AppData\\Local\\Atlassian\\SourceTree\\gitflow_local\\gitflow\\git-flow hotfix start test2  
sh.exe C:\\Users\\john\\AppData\\Local\\Atlassian\\SourceTree\\gitflow_local\\gitflow\\git-flow hotfix finish -p -k -n test2

sh.exe C:\\Users\\john\\AppData\\Local\\Atlassian\\SourceTree\\gitflow_local\\gitflow\\git-flow hotfix finish -p -k -n test2  
Your branch is up to date with 'origin/master'.  
Switched to branch 'master'  
Merge made by the 'recursive' strategy.  
developers.txt \| 3 ++-  
1 file changed, 2 insertions(+), 1 deletion(-)

Your branch is up to date with 'origin/develop'.  
Switched to branch 'develop'  
Merge made by the 'recursive' strategy.  
developers.txt \| 3 ++-  
1 file changed, 2 insertions(+), 1 deletion(-)

To <https://github.com/johnges/tutorial.git>  
073a968..7ed2963 develop -\> develop

To <https://github.com/johnges/tutorial.git>  
88e9f15..73ea02f master -\> master

<br />

Summary of actions:  
- Hotfix branch 'hotfix/test2' has been merged into 'master'  
- Master branch 'master' has been back-merged into 'develop'

- Hotfix branch 'hotfix/test2' is still locally available; it is still remotely available on 'origin'  
- 'develop', 'master' and tags have been pushed to 'origin'  
- You are now on branch 'develop'

Completed successfully.


Answers:
author: John Britto
body: I found that my source tree has been updated the gitflow version from <https://github.com/petervanderdoes/gitflow-avh>

and that is the reason I got the follwong wrong commit message

Master branch 'master' has been back-merged into 'develop'

comments: author: bs-thomas
body: Hey [@John Britto](/t5/user/viewprofilepage/user-id/892006), I'm having this same problem, and was wondering what you meant.

Where in the source does it tell us the gitflow version?

Also, is this supposed to be the expected behavior for the newest gitflow version? Or is that a bug?


author: bs-thomas
body: Referencing this issue here:

<https://github.com/petervanderdoes/gitflow-avh/issues/370>


author: bs-thomas
body: Referencing this issue here:

<https://github.com/petervanderdoes/gitflow-avh/issues/370>


author: bs-thomas
body: [@John Britto](/t5/user/viewprofilepage/user-id/892006) Okay, this explains all. <https://github.com/nvie/gitflow/issues/49>

This is the expected behavior now, because of git-describe.
Unable to log in to my Atlassian account during installation
Asked by albertoa73:

Hello, I'm not able to log in to my Atlassian account during the Sourcetree installation steps.

I typed the e-mail address and the password, but the Log In button continue to wait and the installation process don't go forwards.

The sourcetree.log contains the following:

ERROR \[2018-02-20 14:28:47,910\] \[1\] \[SourceTree.App\] \[.ctor\] - finish EnsureSquirrelExecutionStubIsCopied  
ERROR \[2018-02-22 13:43:19,882\] \[1\] \[SourceTree.App\] \[.ctor\] - finish EnsureSquirrelExecutionStubIsCopied  
ERROR \[2018-02-22 14:06:52,879\] \[1\] \[SourceTree.App\] \[.ctor\] - finish EnsureSquirrelExecutionStubIsCopied

![Screenshot_16.png](/t5/image/serverpage/image-id/15595i01C3426B256843BD/image-dimensions/432x263?v=v2 "Screenshot_16.png")![Screenshot_17.png](/t5/image/serverpage/image-id/15596iD17523D0630D0066/image-dimensions/253x392?v=v2 "Screenshot_17.png")


Answers:
author: Andrew Magill
body: See my answer [here](https://community.atlassian.com/t5/Sourcetree-questions/How-do-I-setup-Sourcetree-to-access-Github-now-that-they/qaq-p/735377#U735421).


author: bgannin
body: We've had a few reports of this and it usually relates to a network management issue preventing the id.atlassian.com endpoints from loading. Could there be anything like that in play?
How can I link SourceTree with my GitHub account ?
Asked by ApacheU6:

Hi community !

I'm starting to SourceTree and for push my project an error ask me invalid username or password : ![sourcetree_error_invalidaccount.jpg](/t5/image/serverpage/image-id/15588i83B78786BF3ABEEB/image-size/large?v=v2&px=999 "sourcetree_error_invalidaccount.jpg")

But I was connected my GitHub account correctly :![sourcetree_error_account.jpg](/t5/image/serverpage/image-id/15589iF1E596FDE66208EA/image-size/large?v=v2&px=999 "sourcetree_error_account.jpg")

SourceTree recognize my account but I can't push my project, I think the User when I push my project is different like my GitHub account. I don't know how to change it ? Some help ?  

Thank you !


Answers:
author: ApacheU6
body: \[Up\]

Any suggest ?


author: minnsey
body: Hi  

If you haven't already can you update to v2.4.8.0.  

Can you then open Windows Credential Manager and under the Windows Credentials section delete all entries with the prefix 'git:'  

Can you then try re-adding your GitHub account in the Tools/Options/Authentication tab.  

Can you then confirm that the Remote Repositories section in the New Tab correctly lists your GitHub repositories.  

If that works then you should find a new entry in the Windows Credentials prefixed with 'git:'  

At that point you should be able to fetch/pull/push with your remote.

comments: author: Nick Williams
body: I am having the same problem today, but this solution does not fix it.


author: ApacheU6
body: Thank you for your answer Michael.

I've the update v2.4.8.0.

I've followed your step, but I can push but I can't pull and the same error appears : invalid username or password.

In the push window command at the bottom, I think I should have the git account but it's the atlassian account who is connected : ![sourcetree_error_atlassianaccount.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/15683i8A46D03C861D8F2B/image-size/large?v=v2&px=999 "sourcetree_error_atlassianaccount.jpg")


author: minnsey
body: Hi It is odd that you can push but not pull.  

Can you check your Git version? GitHub recently made some security changes and you will need to be running Git 2.16 or higher to avoid being effected by them.  

<https://githubengineering.com/crypto-removal-notice/>


Tags: github

link
How to setup SFTP connection with Jenkins Job to push the Code from Bitbucket to SFTP server
Asked by annamreddy:

I am looking to setup SFTP connection with Jenkins script, to push the Code from Bitbucket to SFTP server.


Answers:
author: Tim Razik
body: Hi, can you be more specific as to what you are looking to accomplish. When you say "code" do you mean compiled libraries or do you mean source code?  

Are you using Jenkins Groovy Pipeline or are you just trigginring a remote "script".

comments: author: Thulasi Veerapalle Kumar
body: yes


Tags: bitbucket

bitbucket-cloud

bitbucket-development
Sourcetree keeps asking for wrong account password
Asked by Ryan Burnham:

So i had to change the primary account i use for bitbucket because of this issue [https://community.atlassian.com/t5/Bitbucket-questions/Sending-email-notifications-to-team-alias/qaq-p/711858?utm_source=atlcomm\&utm_medium=email\&utm_campaign=answer_accepted_as_solution\&utm_content=topic](https://community.atlassian.com/t5/Bitbucket-questions/Sending-email-notifications-to-team-alias/qaq-p/711858?utm_source=atlcomm&utm_medium=email&utm_campaign=answer_accepted_as_solution&utm_content=topic)

But now sourcetree keeps asking my for the password of my old account when ever i try to do anything with my git repo hosted on bitbucket. If i go to Tools \> Options \> Authentication. i see the correct new account only. (at first i wasn't able to delete my old account from here but i found out that you can remove it from the Windows Credentials Manager). Also i wasn't able to use basic auth due to this bug <https://jira.atlassian.com/browse/SRCTREEWIN-7933>  
So i had to use oauth for the new account.   

But now it keeps prompting me to enter the password of my old account. How can i fix this?


Answers:
author: minnsey
body: Hi  

Can you check the remote URLs you are using for your repositories, do they contain the old username?  

If do you will need to replace them to use URLs with your new username.

comments: author: Ryan Burnham
body: Thanks, that was it. I didn't think to check for that.


author: Patrick Cloosterman
body: I have the same problem. I only have 1 project opened in sourcetree. The url is fine. Still it complains about an account I used months ago.


author: evancamilleri
body: I have the same problem. The url is fine too.


author: Andres Cuevas
body: <https://confluence.atlassian.com/sourcetreekb/how-to-wipe-sourcetree-preferences-412484640.html>

this did it for me. this software sucks!
Changing history (amend commit) pop-up in SourceTree
Asked by Christopher Dura:

When you try to amend a commit in SourceTree there's an alert dialog that warns you, and there's also a checkbox to never show it again. I accidentally checked it, but I want the warning to come up if I try to amend a commit.

Is there a way that I can reset it so that I'll be warned every time? Or, is there a way to reset all similar alerts like that??


Answers:
author: bgannin
body: There isn't a way to reset alerts in Sourcetree. What OS are you on? We can probably provide a hint as to reset the preference from command line at least ?

Brian Ganninger  
Senior Mac Developer, Sourcetree

comments: author: Christopher Dura
body: [@bgannin](/t5/user/viewprofilepage/user-id/744444) Mac OS


author: bgannin
body: You can reset that using the following Terminal command:

```
defaults write com.TorusKnot.SourceTreeNotMAS gitSuppressWarnOnAmend NO
```
Source Tree application not opening. Looking for suggested fix.
Asked by John Lucas:

I have Source Tree version 1.9 loaded onto a work computer that I have inherited. The application was working fine until recently. It has stopped opening. Any suggested fixes? I am hoping to not nee to reload it as I have no login information from the last person who was using it and I don;t want to lose my branch


Answers:
author: Mike Corsaro
body: Hello! Unfortunately, we don't support versions of Sourcetree that old. You can download the latest version [here](https://downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-2.4.8.0.exe)
Can't open SourceTree Bookmarks in version 2.4.8
Asked by braj_98:

I am not able to see the bookmark view in the left pan. If a close a tab by mistake then it becomes difficult to open it again .


Answers:
author: minnsey
body: The Bookmarks sidebar was removed in version 2.0

comments: author: braj_98
body: Thanks Michael. That explains why I am not seeing it. Is there anyway I can see all the git repo in one place or all the git repo that I have linked with sourcetree?


author: Aleksey Muratov
body: Hi Braj,

Left-mouse click on "+" sign, which is next to the most right tab will create tab named "New tab" where you will see list of local repositories.
Unable to extract PortableGit.7z
Asked by Kengo Furuta:

I just installed sourcetree (for using with GitBucket) and try to make local repository. However the warning and error ware occurred. They said that installed Git was not found in my PC so I tried to download the portable Git, but it failed. PortableGit.7z seems not to be able to be extracted. (please see the warning and error window as the attachment).

How can I solve this error?

For your info:

- PortableGit.7z was created by these operation but the file was empty (size is zero)

- I tried to cut the firewall and download the files again, but the result was same(PortableGit.7z is empty)

- there is similar FAQ at the link below but the this issue still occur for me...

[similar faq](https://goo.gl/tBaAjD)

- sourcetree version: 2.4.8.0

- Windows 7 SP1

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

![Operate2.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/15403i8E63D4735D2D1404/image-size/large?v=v2&px=999 "Operate2.PNG")


Answers:
author: Mike Corsaro
body: Hello! If the portable git download doesn't work, then you can just download the stand-alone version of Git for Windows [here](https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/Git-2.16.2-64-bit.exe)

comments: author: Kengo Furuta
body: The error was solved by your advice. Thank you so much!
Sourcetree crashing on startup[Fault Module Name: KERNELBASE.dll] [Window 7]
Asked by vivek jolly:

Problem signature:  
Problem Event Name: APPCRASH  
Application Name: SourceTree.exe  
Application Version: 1.7.0.32509  
Application Timestamp: 56673584  
Fault Module Name: KERNELBASE.dll  
Fault Module Version: 6.1.7601.23677  
Fault Module Timestamp: 589c9a27  
Exception Code: e0434352  
Exception Offset: 000000000001a06d  
OS Version: 6.1.7601.2.1.0.256.1  
Locale ID: 1033  
Additional Information 1: 367e  
Additional Information 2: 367e805d0e7c1ec3f63b05bb5ce5c416  
Additional Information 3: 01b0  
Additional Information 4: 01b06619ef05f4f4afe735834ebd25cd

Please provide quick solution(Tried with old version of source tree also)


Answers:
author: Mike Corsaro
body: Hello! We don't support version 1.7 anymore, could you try using the [latest version (2.4.8)?](https://downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-2.4.8.0.exe)

If the problem still persists, could you please link the Bugsplat issue submission id? Thanks!