atlassian-sourcetree

问题 I am using Mercurial for my source control and SourceTree to manage it. I want to use Visual Studio's built in diff and merge tool (vsdiffmerge) for comparing files however this is not working. I am currently using the following: Diff Commands: \"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe\" Diff Arguments: \"$LOCAL\" \"$REMOTE\" //t Merge Commands: \"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe\" Merge Arguments: \"

问题 I've created a very simple pre-commit script:- #!/usr/bin/env sh # Run tests npm test if [ $? -ne 0 ]; then echo "Tests failed. Aborting.." exit 1 fi exit 0 When I run git commit at the command line (with failing tests), I get the expected exit 1 with the message Tests failed. Aborting.. . However, If I use GitHub for Mac however I get: .git/hooks/pre-commit: line 5: npm: command not found Tests failed. Aborting.. (256) I'm guessing its down to npm not being available to the execution

问题 How do I continue cherry picking using SourceTree after I resolved confilcts. If I am doing rebase and I get conflicts then after resolving them when I click commit SourceTree lets me continue that rebase. But how to continue cherry pick operation? 回答1: 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-pick ing you just need to commit after resolving them to finish the cherry-pick . EDIT Edward

问题 I get this error warning: templates not found /usr/local/git/share/git-core/templates when I cloning repo in local repository this link, this link, and this link I tried this method and I just waiting more than 20 minutes but repo doesn't clone. I use source-tree and OS X El Capitan. How can I fix it? 回答1: Create a templates folder. In your case, it should be: mkdir /usr/local/git/share/git-core/templates 回答2: I was also getting same error warning: templates not found /usr/local/git/share/git

问题 Can someone give me a quick walkthrough on simply cloning a repo with SourceTree? In Bookmarks, I click on Clone Repository. For Source Path I paste in the URL which looks like this: git@codebasehq.com:client/appname/ios-application.git But I get "This is not a valid source path / URL". I'm copying directly from the Repository Browser in codebase so I know the URL is correct. What else do I need to do? 回答1: My solution was to change the Git version from 'Use Embedded Git' to 'Use System Git'.

问题 I wanted to know what the difference is between discarding a file and and stop tracking a file in git using source-tree. If I deleted a file in my updated code and I want that file deleted on the repository too should I mark it as stop tracking or should I discard it during the commit process 回答1: In SourceTree, selecting "discard" on a file just throws away your local changes; stop tracking removes it from the repository. However, as long as you have deleted the file on your local drive, and

问题 In TortoiseGit and TortoiseSVN it is possible to export all changed files between two revisions, including the directory structure, to an external folder. Is there a way to do so in Atlassian SourceTree (for Windows)? 回答1: Try this: git archive --output=test_zip.zip HEAD $(git diff --diff-filter=ACMRTUXB --name-only hash1 hash2) Just replace the hash 1 and hash 2 in the example with the desired commits hash and name the zip file where you want your change to be zipped. It works for me 回答2:

问题 We have Atlassian Stash installed on a Windows 2008R2 server, and for the most part everything is working nicely. We have an SSL certificate issued by our local on-premise CA and a DNS entry set up so we can go to https://stash/ and it works quite nicely, except in Firefox where it throws a warning (related?). When using Atlassian's Sourcetree we can navigate and choose a repository, but when we try to clone it we get the following error: fatal: unable to access https://user@url/scm/etc/etc

问题 I have the following in my .gitconfig file: [user] name = myname email = myname@gmail.com [core] autocrlf = true excludesfile = C:\\Users\\myname\\Documents\\gitignore_global.txt [diff] tool = meld [difftool "meld"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe" prompt = false [merge] tool = meld [mergetool "meld"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe" [difftool "sourcetree"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE" [mergetool

问题 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 'Merge?'. This commit added numerous files and altered numerous others and was never intended to take place. Using 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.) 回答1: If you have pushed the commits upstream... Select the commit you