cherry-pick effectively applies the changes from commit A onto the working tree and makes a commit. This means if you get any conflicts during cherry-picking you need to commit after resolving them to finish the cherry-pick. EDIT Edward noted that this is only true when you are cherry-picking a single commit. When picking multiple commits … Read more
My solution was to change the Git version from ‘Use Embedded Git’ to ‘Use System Git’. Because I installed GitHub on my computer earlier, it seems SourceTree chose that Git by default rather than download the embedded version when it was installed.
Adding a line Icon? to .gitignore worked for me. https://answers.atlassian.com/questions/167170/removing-invisible-icon-files-on-a-local-repository-on-a-mac
Updated 2020-11-27 Happy to see that SourceTree allow users to skip the login procedure in version 3.3.9. For older versions: SouceTree uses accounts.json file to store account settings. It would skip the login process if there is an accounts.json file in your machine. So you can copy the accounts.json file in %AppData%\Atlassian\SourceTree\ to any other … Read more
Yes, there is a filter provided in SourceTree at the bottom left corner below the list of all branches. See in the screenshot. NOTE: This is on MAC..
Change The Maximum Lines And Size In Options Tools > Options > Diff Change Max Diff Line Count And Change Size Limit (Text)
What needs to be checked before anything else is the access level, which should be set to write. This can happen if you were added to the repo by someone else, and they forgot to grant you the required permissions.
For OSX android studio i’ve accomplished with this steps: Open IntelliJ/Android Studio -> Tools -> Create Command Line Launcher After that, open SourceTree Preferences: and put “/usr/local/bin/studio” in Diff/Merge Command. Like this: Diff Arguments: diff $LOCAL $PWD/$REMOTE Merge Arguments: merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED And if everything it’s ok it should work.
I found this to checkout a remote branch: Repository > Checkout > Checkout New Branch > Checkout remote branch [select remote branch to checkout] The branch I selected is now shown in the menu on the left under branches, (although still not in the branches dropdown box along the top) Hope this helps.
The accepted solution provides details only about how OP got around the issue and it is not a definitive answer. For the sake of people like me who end up here from Google, Here is the solution that actually works. Lets say, if the error message looks like below, error: cannot lock ref ‘refs/remotes/origin/angular_removal’: unable … Read more