i had same problem: i wanted different .htaccess file per repository then i couldn’t because htaccess file had already been added to repository. It’s working now, i can change any of the .htaccess file from any version without getting git pushing them. Marc is right when he says “You need to remove it first, before … Read more
No, I really hope to see that feature in some of the future releases.
This applies to Git in general, not just with SourceTree. When you stash changes, the items that will be stashed are the changes to tracked files in your working copy and in the staging area. Those changes will be saved in the stash, and reverted in the working copy and index. When you choose to … Read more
I had to do some additional work from Patoshi’s answer. In Tools > Options > General > SSH Client Configuration, I had to point it to the id_rsa key, and select OpenSSH as the SSH Client (Putty/PLink is selected by default). Then each time you start SourceTree, a prompt will appear asking for the passphrase … Read more
Your git is out of date. You need to update your system git and then switch ST to use that. I think ST’s embedded git needs to update the latest git version available on their server (complete guess). In the meantime, this works for me.
Someone on the GitLab forum had a similar issue recently, and they documented the steps to solve it: I eventually noticed that for github and bitbucket the credentials are through “Oauth”, and for GitLab “Personal access token”. I had generated yesterday a toke, but hadn’t used anywhere. Steps to add a repo from GitLab on … Read more
I just disabled SSL certificate checks (which is fine for internal repos): Sourcetree > Preferences > Git > Disable SSL certificate validation (ticked)
When the repository is cloned, you will see all of the remote branches under “Remotes” in the Sidebar. If any content is missing, you can click Fetch to fetch all objects necessary to complete the history for all branches and tags in the remote repository. If you can see it in SourceTree, it’s stored on … Read more
In the working copy view there is a dropdown where you can select a filter for the visible files in the column below. Just select “All Files” instead of the “Pending” default. On the right side there also is a Searchbox to filter this file list.
Checkout master Click Merge button and Merge dialog opens Select commit with message “add line 1” and click OK Not entirely clear in the question, but did you try this already? The key step is making sure you currently have master checked out.