Recently I have installed Source Tree in my windows machine. How can I use the source tree for commit, merge of code to central repository?? And also how can I switch the branches ?? Can any one kindly provide me the links on how to overcome this??

How to switch to other branch in Source Tree to commit the code?

Since yesterday, bitbucket repository started returning this on any request:

    remote: Too many invalid password attempts. Try logging in through the website.  
    fatal: unable to access &#39;https://xxxxxxxxx@bitbucket.org/xxxxxxxxxx/xxxxxxxxxxx.git/&#39;: The requested URL returned error: 403

This happens on both the server (trying to git pull) and client (SourceTree on mac).

The user employed on both sides is the same, I can login to bitbucket and see no problems. 
Both SourceTree and git on the server use different &quot;App Password&quot; generated in bitbucket.
I am the only person using this account daily.

I created a new App Password and tried with it just to get the same error.

What can I do to solve the case?

&gt; Update #1: Generating a new App Password does not work for both server and client. Re-adding a SourceTree account with Basic authentication does not help too. Bitbucket even does not allow to come to authentication, as it seems - the new App Passwords &quot;Last Access&quot; snows nothing.
&gt;
&gt; Update #2: The accepted answer is indeed a solution. This is quite strange, but resetting the password of the main bitbucket user account works. But the sequence is as follows: reset bitbucket user password; create a new app password for both server and client (SourceTree); for mac, remove the record for bitbucket in KeyChain Access; only try to pull or push from SourceTree after removing the record or the account is locked immediately!

Bitbucket repository started returning &quot;remote: Too many invalid password attempts. Try logging in through the website.&quot; (403) since yesterday

I have an open project in PhpStorm that I manage using SourceTree.  I was trying to remove some image files from a commit using SourceTree, but accidentally selected a file that should not be deleted.  I haven&#39;t changed anything (in either PhpStorm or SourceTree) since deleting the file.  I tried to do &lt;kbd&gt;Ctrl&lt;/kbd&gt;+&lt;kbd&gt;Z&lt;/kbd&gt; in SourceTree but nothing happened.  I then checked in PhpStorm Vcs -&gt; local history, but it didn&#39;t show the file.  How can I recover this file?

Recover deleted file from PhpStorm and SourceTree

I Generated ssh keys and configured my git and SourceTree. I could git pull and do other operations from Git-bash. 
Note: I have added the following in .bashrc to make it work.

    eval `ssh-agent`
    ssh-add

However, when I try to git pull in SourceTree, I get this.
&gt; git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
&gt; Permission denied (publickey,password). fatal: Could not read from
&gt; remote repository.
&gt; 
&gt; Please make sure you have the correct access rights and the repository
&gt; exists.

When I tried to create ssh-key from Putty(windows), it goes further, but waits with this following message!
 
&gt; git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
&gt; The server&#39;s host key is not cached in the registry. You have no
&gt; guarantee that the server is the computer you think it is. The
&gt; server&#39;s rsa2 key fingerprint is:
&gt; 
&gt; ssh-rsa 2048 0f:ee:bb:1c:6c:b4:50:0e:54:d6:e9:55:9b:38:45:df If you
&gt; trust this host, enter &quot;y&quot; to add the key to PuTTY&#39;s cache and carry
&gt; on connecting. If you want to carry on connecting just once, without
&gt; adding the key to the cache, enter &quot;n&quot;. If you do not trust this host,
&gt; press Return to abandon the connection.

if I open the terminal in SourceTree(which is git-bash), it asks me for passphrase. So, i suspect my .bashrc is not sourced by SourceTree. Or am I missing something else? 



cannot pull Git remote repository from Sourcetree

In my team we are migrating from svn to git and we have agreed upon embracing the git-flow flow. I&#39;ve been playing around a while with SourceTree and the Git-Flow extension. Now, we have decided that the develop branch will be called development/current instead, but I do not find in the SourceTree UI where to change the Git-Flow configuration.

Is it possible, once initialized, to change the Git-Flow configuration for a given repository?

How to reset the git-flow configuration in SourceTree?

I&#39;m using SourceTree on OSX and using Git to push to Visual Studio Online.  I get the following error:

&gt;POST git-receive-pack (490857233 bytes)  
    error: RPC failed; result=22, HTTP code = 404  
    fatal: The remote end hung up unexpectedly  
    Everything up-to-date  
    Completed with errors, see above

I have already tried the following:

    git config --global http.postBuffer 524288000


Git error: RPC failed; result=22, HTTP code = 404

I have SourceTree with local working copy. And all operations work good, I can simple fetch, push, pull and etc via SourceTree. I just needed to make force push which does not exist in SourceTree.

I opened terminal made git push -f

    remote: Repository not found.
    fatal: repository &#39;https://github.com/MyRepo/project.git/&#39; not found

I am not sure what can be an issue.

Git - remote: Repository not found

I am using Sourcetree for Windows for a git-repository and would like to undo an unpushed commit.

Is that possible? If I do &quot;revert commit&quot;, it creates a second commit which reverts the first commit, but I don&#39;t want the first commit to appear at all in my source control.

I could also delete my local repository and pull it again without my local commit, but maybe there&#39;s another way?

Sourcetree - undo unpushed commits

How do I edit an incorrect commit message in SourceTree without touching the command line?

**Additional details:**

- This is not the latest commit.
- Everything was already pushed to Bitbucket.
- This is a private repository and I am the only collaborator.
- I don&#39;t mind losing any of the previous commits, as I can re-commit them anytime.
- I don&#39;t want however to lose any code modification ever made.

**Outcome:**

- As it seems impossible at the moment according to your comments and replies, I&#39;m going to create a new repository and start all over. Thanks all for your help!

  [1]: https://bitbucket.org

Edit a commit message in SourceTree Windows (already pushed to remote)

Does Sourcetree offer a way to visualize differences between `git` branches?

I&#39;m looking for:

- names of files that have changed
- diffs between these files

Is there a way to get a visual diff on two branches in SourceTree?

In Atlassian SourceTree, how to know which tags are only local and which are also in remote?

When creating a tag you get the option &quot;Push tag to: ...&quot;, but how to know if a tag has been pushed or not after it is created? I can see all my tags locally, but I need to be sure that they are present in remote so that other developers can pull them.

How to see remote tags?

When attempting to Push via Source Tree, I get the following error:

    git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags origin refs/heads/master:refs/heads/master 
    Pushing to https://user@github.com/repo.git
    To https://user@github.com/repo.git
     = [up to date]      master -&gt; master
    ...
     ! [rejected]        example_tag -&gt; example_tag (already exists)
    updating local tracking ref &#39;refs/remotes/origin/master&#39;
    error: failed to push some refs to &#39;https://user@github.com/repo.git&#39;
    hint: Updates were rejected because the tag already exists in the remote.
    Completed with errors, see above

I didn&#39;t make any changes to this tag as far as I know. How can I fix this?

&quot;Updates were rejected because the tag already exists&quot; when attempting to push in SourceTree

so I have a commit that has a helpful code change, but on another branch.

I would like to apply this commit in the other branch to my working copy on my current branch (not as another commit).

Is this possible? How would I do this?

Thought I&#39;d share this is related to my previous question but specific to working copy:
https://stackoverflow.com/questions/36777547/git-cherry-picking-one-commit-to-another-branch

git - apply a commit on another branch to the working copy

I&#39;m using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.

But, I&#39;m wondering whether there is a nice way to interactively and visually resolve conflicts. For example, if pull detects conflicts, popping up a GUI-based conflict tool (e.g., P4Merge). Is it possible?

I am always doing manual conflict resolving, which is just painful.

This is, for example, a git `pull` message, from SourceTree.


    git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
    From W:\repo\
     * branch            master     -&gt; FETCH_HEAD   
    
    Updating 33c07bf..41e0249
    
    error: Your local changes to the following files would be overwritten by merge:
    	foo.cpp
    	goo.cpp
    	goo.hpp
    Please, commit your changes or stash them before you can merge.
    Aborting    
    
    Completed with errors, see above.



How to interactively (visually) resolve conflicts in SourceTree / git

I&#39;m trying to push my project via the https protocol on bitbucket using sourcetree.  
But I can&#39;t connect to bitbucket with my login and password (which work on the website), I have a fatal error : &quot;Authentication failed&quot;.  

I read on other posts I can work around the problem using the ssh protocol instead of the https one, so I set up a ssh key following instructions on the &lt;a href=&quot;http://www.sourcetreeapp.com/faq&quot;&gt;source tree faq&lt;/a&gt;.
But now I don&#39;t know how I can change to the ssh protocol when I want to push my code.
Someone know how I can do this ?
Thank you.

Authentication failed to bitbucket

I am using SourceTree (with BitBucket) to manage my code.  I have forked a repo, and the parent repo has been updated.

How do I use SourceTree to merge the upstream code into my forked repo?

How do I update my forked repo using SourceTree?

Im trying to push to github with sourcetree but get the following error:

&gt; git -c diff.mnemonicprefix=false -c core.quotepath=false push -v
&gt; --tags origin live_version:live_version remote: Invalid username or password. fatal: Authentication failed for
&gt; &#39;https://github.com/myname/myrepo/&#39; Pushing to
&gt; https://github.com/myname/myrepo
&gt; 
&gt; Completed with errors, see above.

[![enter image description here][1]][1]
However when I go to 

&gt;tools &gt; authentication &gt; my github account

And click edit &gt; refresh oauth token
[![enter image description here][2]][2]
A page opens and I get:

Authentication Successful

    SourceTree has been successfully authenticated. You may now close this page.

It always worked but it suddenly stopped, i do not have two factor authentication. 
I tried deleting the account and adding it again to no avail.
How can I get the connection working again so that I can push my project to github.
  
*Sourcetree version 2.1.8.0*

  [1]: https://i.stack.imgur.com/pmZMm.png
  [2]: https://i.stack.imgur.com/c52yJ.png

Sourcetree remote: Invalid username or password

I use all my development tools in the dark theme except Sourcetree.

It has no option in its configuration to change theme.

Is there any other way to change for a dark theme?


How can I change Sourcetree theme?

I think I am confused on how to use SourceTree GUI to do git rebase. I have two branches &quot;master&quot; and &quot;dev&quot;. As seen, the two branch diverged. I want to do a rebase on &quot;dev&quot; branch, using command line, this would be:

    git checkout dev
    git rebase master

[![enter image description here][1]][1]


I would have expected to right click &quot;dev&quot;, and choose &quot;Rebase current changes onto dev&quot;. I assume current changes means &quot;new commits on master&quot;. But picking this option seems have no effect whatsoever. What would be the correct steps?

  [1]: http://i.stack.imgur.com/POAIV.png

git rebase using sourcetree

I use Sourcetree to pull and push to a server over ssh. Sourcetree has remembered the password but the password has changed. I cannot find how to inform Sourcetree of the new password.

Based on Google searches, I have tried the following things:

* Looked under Tools &gt; Options &gt; Authentication in Sourcetree. Nothing is listed here.

* Looked in the Windows Credential Manager in the Control Panel. Nothing related to git/Sourcetree or the server in question is listed here either.

I am using Sourcetree 2.0.18.1

**Update**

I have been circumventing this problem by using key based authentication through pageant. In the meantime, there have also been updates to Sourcetree and I&#39;m currently using 2.3.1 for which editing/removing the `%LOCALAPPDATA%\Atlassian\SourceTree\passwd` file works (2.0.18 didn&#39;t have that file).


Sourcetree change password of existing account

I&#39;m new to the Git environment, and I&#39;m using BitBucket with SourceTree on Mac. All I want to do now is to discard the changes since last commit. How should I do this? I haven&#39;t found anything like &quot;discard changes&quot;, and directly pulling from the last commit doesn&#39;t seem to work. Solutions done with either the GUI or command line will be good.

How to discard uncommitted changes in SourceTree?

Is there a quick and easy way to open a git repository in SourceTree from the command line? 

I do a lot of git work from Terminal, but sometimes there&#39;s no replacement for a good history view/diff. Would love to be able to open without using bookmarks.



How do you open SourceTree from the command line?

After updating domain password, accessing git-repo is no longer possible. VS Code and Source Tree as well as Visual Studio are returning the following error message on pull, push, fetch etc..

    fatal: Authentication failed

Normally a credentials pop-up should appear however this is not happening. Also the common recommendation... 

    git config --global credential.helper wincred

...is not working.


Getting &quot;fatal: Authentication failed&quot; -error when sending git commands in Windows 10

I have a Bitbucket Git repository managed with Sourcetree.

I have two folders that I want to commit, but I need to ignore all the files in these folders, because they contain only temporary files.

How can I do that?


How do I ignore all files in a folder with a Git repository in Sourcetree?

Hey I just updated Sourcetree on my mac to the latest version (2.2).
Where did git-flow go? 

And how do I re-enable this functionality?

I just lost myself without it!

Sourcetree - upgraded to latest version, git-flow missing

I am working on a maven project and I want to ignore the files generated and stored in the /target folder of my project (Evaluation) root folder.In the root of my git repository I have a .gitignore file with the following entries (backend is just a folder which contains the eclipse project Evaluation)

    backend/Evaluation/logs/
    backend/Evaluation/target/

For some reason SourceTree does not ignore the files stored in these two folders and when I compile my project there are some uncommitted changes which are some .class files inside the /target folder.

Why is this happening ? I also tried to change the .gitignore entries to 

&gt; /backend/Evaluation/logs/**

but it did not work too. 

Any ideas ?

.gitignore file in Sourcetree not working

I&#39;d like to see who contributed which line/change to a file.  git-blame does exactly that.  So does SourceTree have a git-blame view?

Where is git-blame in SourceTree

I&#39;m using SourceTree and try to clone from a general github repository, but I got this error:

&gt;fatal: unable to access &#39;https://github.com/mfitzp/15-minute-apps.git/&#39;: error:1407742E:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert protocol version
Completed with errors, see above.

How to solve it?

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

I&#39;m using [SourceTree](http://www.sourcetreeapp.com/) as my git tool on Windows.

I have a *main* branch and a *feature* branch and I can&#39;t get SourceTree to perform a rebase when I have a conflict.

*main* looks like:
&gt;c1 -&gt; c2 -&gt; c4 -&gt; c5

*feature* looks like:
&gt;c1-&gt; c2 -&gt; c3

I want to rebase *feature* so it will be:
&gt;c1 -&gt; c2-&gt; c4-&gt; c5-&gt; c3

There is a conflict between *c3* and *c5*.  I can resolve the conflict, but when I commit the changes I get a *HEAD* tag and looking at my graph I can see that *feature* branch wasn&#39;t rebased.  

How can I get the rebase to work?




Using Source Tree, rebase with conflict, rebase doesn&#39;t work after conflict resovled

Is it possible to change the commit date from my commit to the author date?

I adapted some commits and now the dates are all the same. I want to set it back to the old dates (or the author dates). Is this possible?

I am using Sourcetree so I have the git command line but I am not a pro at that. My external repository is bitbucket.

GIT: change commit date to author date

I&#39;m using git gpg signing. I want to disable it. I&#39;ve set `.gitconfig`

    [user]
    	name = NAME
    	email = EMAIL
    	signingkey = KEY
    ...
    [commit]
    	gpgsign = false

My commits are still signing by default. 

PS: I also disabled from Sourcetree `Repository/ Repository Settings/Security` tab. Both Sourcetree and terminal forces to use gpg. 

How to disable git gpg signing

I am using source tree. I had created a stash of multiple changes and by mistake deleted it. Is there a way to retrieve them back?

Retrieve deleted stash in Git using SourceTree

I am not able to clone or push to a git repository at Bitbucket in Eclipse:

![Error &#39;cannot open git-upload-pack&#39;][1]

It&#39;s weird, because a day before I didn&#39;t have any problem. I have downloaded the sts 3 times with no luck. This error keeps showing. Also I have installed SourceTree and it says &#39;This is not a valid source path / URL&#39;:

![Error &#39;This is not a valid source path / URL&#39; in sourcetree][2]

If I use git commands to import the project, it works, but I wan&#39;t to use EGit for this task, since I am a newbie with git. 

I don&#39;t know if this has to do with it, but in the same directory I have the android-adt-bundle. This one works pretty well, but the project lies on GitHub and not Bitbucket. Also, I&#39;m working with another person and he is able to fetch and push data from and to the Bitbucket repository. I have read lots of posts but none of them have helped me out. 

I&#39;m using Windows 7 btw.


  [1]: http://i.stack.imgur.com/N2Lu8.png
  [2]: http://i.stack.imgur.com/5a7e1.png

&#39;cannot open git-upload-pack&#39; error in Eclipse when cloning or pushing git repository

My organization is switching from Bitbucket to Github for project management. Today, I was trying to transfer our most recent project from Bitbucket to Github, by using SourceTree. I added a second remote repository to the project (using the URL of the destination repository on Github), brought everything up to date, and then attempted to push the code to the repository. A box popped up, asking for the password to my Github account. I entered in my (correct) password, and clicked &#39;OK&#39;, and the dialog box popped up again. I entered in my password (correctly) again, and it did the same thing.

My username is correctly identified, my password is correct, and I tried updating SourceTree because I had heard that it was an issue with a previous version. The problem persists.

I am using SourceTree 2.3.1

SourceTree keeps asking for Github password

I currently work on a project in which SVN is used as a repository. Locally, I do several &quot;experiments&quot; with the code that I don&#39;t want to commit to the repo. Therefore I use git locally on top of the SVN working directory and use multiple branches for different &quot;experiments&quot;. So it looks e.g. like this.

    C0 ---- C7 (master)
     \
      \---- C1 ---- C2 ---- C4 (exp1)
       \     \       \
        \     \       \---- C3 (exp2)
         \     \
          \     \---- C5 (exp3)
           \
            \---- C6 (exp4)

On branch ``master `` I want to have the untainted SVN repo, i.e. C0 is SVN Repo Revision x and C7 is SVN Repo Revision x + n.

Is it somehow easily possible to rebase all the ``exp`` branches onto C7 at once in such a way that the tree will look like the following diagram?

    C0 ---- C7 (master)
             \
              \---- C1&#39; ---- C2&#39; ---- C4&#39; (exp1)
               \     \         \
                \     \         \---- C3&#39; (exp2)
                 \     \
                  \     \---- C5&#39; (exp3)
                   \
                    \---- C6&#39; (exp4)

I want to use rebase since I don&#39;t want to modify the state of my local SVN Checkout and want to have my changes built on top of the SVN revisions.

I&#39;m also interested in solutions that work from within SourceTree without having to use the shell.

How can I rebase multiple branches at once?

I want to push my commits to a Bitbucket repository but this error occurred:

    Fatal: unable to access
    &#39;https://myUsername@bitbucket.org/myUsername/myRepository.git/&#39;:
    Unknown SSL protocol error in connection to bitbucket.org:443

Unknown SSL protocol error in connection

Recently in a project with multiple people, a commit was made as seen in the image below. Marked in red you can see a commit with the description/comment of &#39;Merge?&#39;.

This commit added numerous files and altered numerous others and was never intended to take place.

Using [tag:atlassian-sourcetree] what do I need to do to roll everything back to the commit highlighted in blue? (I am 8 commits behind as seen in the screenshot.)

![sourcetree troubs][1]


  [1]: http://i.stack.imgur.com/wmoTF.png

How to rollback everything to previous commit

I made quite few changes in my project (I was working on a remote branch and not the master), I committed them and created a pull request on BitBucket and merged the branch to master. I had forgotten to push my changes after the commit. Now, after trying switching the current branch to my remote branch and reverting to the commit before the merge, I managed to get all my changes back and back them up elsewhere in my system. What I want to do now is undo the bad merge that I did. Each time I click on the merge and select &quot;Reverse commit&quot;, I get the following error message:

&gt; &quot;error: Commit &lt;commit_id&gt; is a merge but no -m option was given.
    
&gt; fatal: revert failed&quot;

The branches look like this now:

![enter image description here][1]

I want to remove the merge and bring it to a state such that it doesn&#39;t say `master(4 behind)` anymore.


  [1]: http://i.stack.imgur.com/bJ2eK.png

Removing/undoing a merge on Sourcetree

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts.  Out of the blue it has stopped working: when I right click and select `Resolve Conflicts &gt; Launch External Merge Tool`, FileMerge launches, creates its intermediate files, then immediately exits.  SourceTree interprets that as the merge process being complete.

What&#39;s the issue and how can I debug/fix it?

I note that a previous question &#39;[SourceTree filemerge quits immediately and creates 4 files. How to fix it?][1]&#39; does not address this particular scenario (for one, it says FileMerge quits in the title, but in the body it says FileMerge displays /dev/null as one of the panels.  Additionally, my merge conflict is not due to a removed file.)

[1]: https://stackoverflow.com/questions/16394718/sourcetree-filemerge-quits-immediately-and-creates-4-files-how-to-fix-it

FileMerge quits immediately after launching from SourceTree

I worked on github and integrated it to sourcetree (MAC version) for one of my project. I would like to use sourcetree for GITLAB. But I am not able to add remote of gitlab to source tree. In Repository settings, Only I can see host type as &quot;unknown&quot;, &quot;bitbucket&quot;, &quot;github&quot; &amp; &quot;stash&quot;. I used unknown but it won&#39;t help me.

Sourcetree Version 2.0.4 (2.0.4)

![enter image description here][1]


  [1]: https://i.stack.imgur.com/AkzBB.png

How to integrate sourcetree for gitlab

I&#39;ve created a pull request and I&#39;ve merged it to an wrong branch. How can I revert it?

As far I&#39;ve been to figuring out taking a look over there, I&#39;m able to hard reset the destination branch... but, how about the pull request in `origin` repository?

I&#39;m using Bitbucket and I&#39;ve created the pull request from SourceTree (opening the Bitbucket page).

I&#39;ve three branches I&#39;m working on: `master`, `dev` and `create-alias`. `create-alias` was set up from `dev` and `dev` from `master`: `master -&gt; dev -&gt; create-alias`. The problem is I made a pull request from `create-alias` and I did merge it into `master` instead of `dev`.

I&#39;m working on `create-alias` branch right now. The last commit on `create-alias` is `6ee20f9` and the merged commit on `master` is `be36f72`.

Could you write me down a bit about who to step-by-step revert it?

As far I&#39;ve been able to figure out:

 1. checkout on `master`.
 2. revert -m 1 `6ee20f9`.
 3. push.
 4. checkout on `create-alias` and going on working.

Isn&#39;t it?

Revert a merged pull request on Bitbucket

I added only 1 comment in the commit change. I didn&#39;t push yet. How can i add more comments to it? I&#39;m a bit afraid to do things wrong.

![sourcetree][1]


  [1]: http://i.stack.imgur.com/j8vWB.png

edit commit comments in sourcetree after pressing commit

I work on a lot of small projects on daily basis and need to switch often.

 - I have over 50 Git Repositories in Sourcetree.
 - Usually 5 projects are open in &quot;Tabs&quot;.

Switching from &quot;Tab&quot; in SourceTree is very slow. Sometimes up to 15 seconds. How can I improve this behaviour?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/Nga4K.png

All Atlassian Sourcetree Solutions on Gang of Coders

Total of 43 Atlassian Sourcetree Solutions