atlassian-sourcetree

Stash/branch/working copy confusion

三世轮回 提交于 2019-12-04 17:58:56
I've started using SourceTree and Git recently, but I am still confused about stashing/branching and my working copy files. I've been having trouble finding anything out there that clarifies things for me. My confusion is with regards to the working copy of files in relation to branches and stashes. The way I am expecting things to work is that my working copy of files will also be linked to the branch. If I am to switch branches, it will automatically stash my working copy before switching to the new branch. If I am to switch back to the previous branch, it will again stash the current

How do I configure Visual Studio 2013 for use with Git/SourceTree

前提是你 提交于 2019-12-04 15:49:42
问题 I would like to be able to use Git with Visual Studio 2013. I would also like to be able to use SourceTree but I don't know how the two play together. I have created a project in Visual Studio, configuring it to use Git, but I have no idea where the repository has been created or how I can push it out to a remote repository (BitBucket). Can anyone explain how these three technologies can be made to work with each other? I have looked at the Atlassian Connector for Visual Studio but I have had

How do I filter log by folder in SourceTree?

爷,独闯天下 提交于 2019-12-04 15:36:05
问题 In SourceTree, how do I limit the log to only show commits that affected files within a given folder? I.e. the equivalent to: git log path/to/folder 回答1: This Answer is Outdated This answer is now outdated. It was written before the Windows version of SourceTree had this feature built-in. The current version of SourceTree for Windows (1.5.2.0) has this feature now, so @bozi's solution should now work for both the Windows and Mac versions of SourceTree. Original Answer Instead of using

Sourcetree remote: Invalid username or password

 ̄綄美尐妖づ 提交于 2019-12-04 07:35:41
问题 Im trying to push to github with sourcetree but get the following error: git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin live_version:live_version remote: Invalid username or password. fatal: Authentication failed for 'https://github.com/myname/myrepo/' Pushing to https://github.com/myname/myrepo Completed with errors, see above. However when I go to tools > authentication > my github account And click edit > refresh oauth token A page opens and I get:

SourceTree filemerge quits immediately and creates 4 files. How to fix it?

和自甴很熟 提交于 2019-12-04 06:30:42
yesterday I could merge files in sourcetree with the external tool filemerge. Today, sourcetree wanted me to register me, and after my successful registration, I couldnt start filemerge. When I choose "Launch external diff tool" from the contextmenu of a file, 4 files appear (Backup, base, local and remote) but filemerge quits immediately. When I launch external diff, filemerge displays in the left /dev/null as source. How can I fix it? In preferences I choose filemerge as external diff tool. Have I to write the diff command for source tree manually, to give it the right local version of my

git line ends redux - Mac OS git with contributions for Windows user

风格不统一 提交于 2019-12-04 06:23:38
问题 I do development on Mac OS X. I have a user who is contributing code with CRLF line endings. He currently does not use git. I create a branch, then switch my working tree to it. I copy his file into the working tree. When I try to stage the file, I receive the error fatal: CRLF would be replaced by LF in pcb-gcode.ulp. I've been through endless posts and tried suggestions (such as .gitattributes & git reset) and the only solution seems to be to use sfk or similar to change the line endings

Issue with SourceTree while cloning a GitHub repository

倖福魔咒の 提交于 2019-12-03 22:40:03
I know that similar question is already posted here, however I think that my scenario is a bit different. Here is what I have. I downloaded and installed the latest official version of the SourceTree software. Also, I have GitHub account with permissions to clone and push the repository. In order to manage a local copy I need to clone the on-line version. Here are the steps that I take: Start the SourceTree and navigate to File -> Clone / New ... In the opened window I paste the HTTPS clone URL . I copied it from the browser after I logged-in my GitHub account, so the link is correct. The nest

How do I filter log by folder in SourceTree?

浪子不回头ぞ 提交于 2019-12-03 09:43:36
In SourceTree, how do I limit the log to only show commits that affected files within a given folder? I.e. the equivalent to: git log path/to/folder This Answer is Outdated This answer is now outdated. It was written before the Windows version of SourceTree had this feature built-in. The current version of SourceTree for Windows (1.5.2.0) has this feature now, so @bozi's solution should now work for both the Windows and Mac versions of SourceTree. Original Answer Instead of using SourceTree, you can use gitk -- folderPath to view the history of just the folder. gitk takes many of the same

Where is git submodule update in SourceTree?

独自空忆成欢 提交于 2019-12-03 08:22:30
问题 How can I update git sub modules in SourceTree? 回答1: I couldn't find the answer myself, so I created a custom action. Go to Preferences, Custom Actions, and enter the following info: (This is on a Mac. Your path to the git executable may vary.) 回答2: Just double-click on the submodule or left-click and open the module Once in the submodule, the UI is like any git repo , press on pull/fetch to update to the header. And voila. 回答3: Here is the windows version: This command assumes the location

Why doesn't the graph display a new branch branching off from the master branch, when I create a new branch in terminal?

自作多情 提交于 2019-12-03 06:59:50
问题 Why doesn't the graph in Sourcetree display a new branch branching off from the master branch , when I create a new branch called "testing123" in terminal ? Sourcetree recognises the new branch but it doesn't branch off from the master branch in the graph. Why is this happening ? How can I make Sourcetree graph display the new branch branching off from master? 回答1: It does: it has one new commit done from master . That means you have checked out the new branch testing123 , done one commit and