Mike Corsaro Atlassian Team

Hello! You won't be able to use basic auth with 2FA -- you'll need to use the OAuth option. Could you try that and let me know if it works?

Hello! Sourcetree stores user accounts in the following location: C:\Users\USERNAME\AppData\Local\Atlassian\SourceTree\accounts.json Could you verify the contents of that file after adding an account, and see what happens to it after restarting Sourcetree? It's possible that account settings or a anti-virus is preventing…

There was an issue with the Git Credential Manager that is probably causing this. You can read more about it here To fix it, you should be able to download v1.17.1 of the GCM here. Make sure you switch to "System Git" under Options > Git.

Hello! Any of the following will work: * Hit the "Terminal" button and type: git reset --merge * Switch to another branch, then delete 'master' (hit the "force delete"), then checkout master again under remotes * Or, under the "yourproject/.git" folder, delete the MERGE_HEAD file

Can you confirm the git version you're using (Options > Git > Version). You should be looking for "System Git version > 2.18.0". It may also help to remove all existing credentials as well -- open the Windows Credential Manager, click "Windows Credentials" and remove all entries for "Bitbucket". Make sure you restart…

Sourcetree is built on the .Net Framework, so that's why it's required. Newer versions of Windows come with the required version installed.

Hello! Could you try manually creating the "repoA" folder, and then try again? ST might not be able to automatically create the destination folder.

Hello! You'll need to upgrade your version of the Git Credential Manager to at least 1.17.1: https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.17.1

Hello! I suspect file refreshing is stuck in a loop, could you try disabling auto-file refresh and try again (go to Tools > Options > General > Uncheck 'Refresh automatically when files change'). This has been fixed in the upcoming 3.0 release. If it doesn't work after trying that, could you do the following for me? * Open…

This is an issue with the git credential manager. Download 1.17.1 here: https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.17.1

Hello! This answer might have the solution you're looking for: https://community.atlassian.com/t5/Sourcetree-questions/Re-git-status-failed-with-code-128-error-bad-signature-fatal/qaq-p/207698/comment-id/6023#M6023 To run that command, just open the repo and hit "Terminal".

Hello! You might need to upgrade your version of the Git Credential Manager: https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.17.1

Hello! I'll need a bit more info: * Could you list the parents for the commit with the merge on it? * Could you then list the SHA/Commit for 'origin/dev2' and 'Last tour edits'?

Hello! Could you post a redacted version of your log file? You can find it under: C:\Users\YOUR_USERNAME\Atlassian\SourceTree\sourcetree.log If needed, you can always uninstall and reinstall Sourcetree -- all of your code and repositories won't be modified at all.

Hello! Could you try and update the Git Credential Manager to 1.17.1? Thanks! https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases

Hello! There's a known issue with the git-credential-manager that might be the root cause of this. Please take a look at this: https://community.atlassian.com/t5/Sourcetree-discussions/dev-team-Known-Issue-Bitbucket-Login-with-Git-Credential-Manager/td-p/863235

You'll have to download and install the new release of the Git Credential Manager. As a work-around you can also try the following: * Remove all "Bitbucket" credentials in the Windows Credential Manager (under Windows Credentials) * Switch your URL for your repository to use the SSH url (open the repo, hit "settings",…

Hello! This issue is most likely being caused by an issue in the Git Credential Manager. There's currently a pull-request in review to solve this. https://github.com/Microsoft/Git-Credential-Manager-for-Windows/pull/706

You've tried SSH and it still didn't work? In your original post the URL implies that the URL for the repository is not using SSH. You'll need to replace the origin URL to tell git to use SSH for that repository. First, go to the repository in Bitbucket, and hit the "clone" button, and copy the SSH url: Then, open the…

Hello! There's 2 things you can try: * Use SSH. Directions for this can be found here * Login to Bitbucket using Oauth:

Hello! I'll need a bit more information: * OS * Version of Sourcetree * Version of Git In the meantime, try removing your SSH key from Bitbucket, and try adding a new one. Make sure your SSH key is loaded into Putty.

Hello! It looks like those changes were actually pushed to the remote server (that line about 'Subproject commit' means that the subproject changes did get committed), but to verify you can always just open the submodule/subproject by double-clicking it in the sidebar. It should open the repository, and you can commit and…

Hello! This isn't currently supported, but as a work-around you can use "Create Patch..." which should create a patch-file of the changes in those commits that you can then apply to your working copy.

Hello! If you're having issues logging into Bitbucket Cloud on Sourcetree for Windows, please try and use the "OAuth" option for login: If you're having issues with logging into Sourcetree for the first time with your Atlassian Account (not Bitbucket Server), then it's probably an issue with your IE11 settings. You can…

Hello! You can remove credentials by going to "Options > Accounts" and remove accounts you don't need. Sometimes removing all accounts can solve issues with the Git Credential Manager.

Where is the error dialog box coming from? Is Semantic Merge the one giving it? Can you post a screenshot? I'm unable to reproduce the issue on my machine on both the enterprise and non-enterprise versions 😕

Looking at your .gitconfig file, it appears that it's different than mine -- can you try manually editing it so that it looks like this? [difftool "sourcetree"] cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' \"$LOCAL\" \"$REMOTE\"

Hello! This has been fixed in the next release, which should be shipping soon. Sorry for the issues it's been causing!

Hello! It looks like you might be on a branch named "master" that's not the same as the master branch that exists on the remote server. That's pretty confusing! To fix this: make sure you commit your changes, and then try and make a new branch (hit the "Branch" button). Give your branch a descriptive name, and then push…

Hello! SemanticMerge isn't officially supported as a diff tool, but you can use it by configuring it under "Custom" in the "Options > Diff > External Diff Tool" menu. The configuration should look something like this: