atlassian-sourcetree

How To Re-Locate Working Copy In SourceTree

試著忘記壹切 提交于 2019-12-06 19:02:40
问题 I have a repository added to SourceTree. When I commit a change to the remote repository through XCode I see the change get committed remotely but my working copy doesn't get updated in SourceTree app. I have to rebase the changes to master in SourceTree. This is because my working copy folder is set to the wrong location in SourceTree. How can I change the location of the local working copy folder in SourceTree? 回答1: Easiest way is to move your old Working Copy (rename the folder) When you

Initial push to GitHub Missing Sub Directory

你说的曾经没有我的故事 提交于 2019-12-06 16:21:51
I made an initial push to GitHub from our codebase but one of the two websites sub directory didn't get pushed for some reason. We had .git files in both sub directories but removed them prior to making this new combined repository. We've tried adding a single file to the sub directory but SourceTree isn't seeing picking up the changes. How would you add those subfolders? VonC We had .git files in both sub directories but removed them prior to making this new combined repository. It is not enough: you need to remove (untrack) the gitlink (folder name of the two subdirectories, viewed as a

Git commit signing GPG issue

允我心安 提交于 2019-12-06 12:21:43
I am having the following issue when I am trying to create a commit using Git Extensions and SourceTree "C:\Program Files\Git\bin\git.exe" commit -F "C:\Code\XXX\.git\COMMITMESSAGE" gpg: keyblock resource 'C:/Code/XXX/%appdata%/gnupg/pubring.kbx': No such file or directory gpg: skipped "ZZZZZZZZZZ": No secret key gpg: signing failed: No secret key error: gpg failed to sign the data fatal: failed to write commit object Done My pubring.kbx exists in my %appdata% directory but why is it prefixing the repo path to it? This is on a windows machine FYI. I have this working on another windows machine

Stash/branch/working copy confusion

自古美人都是妖i 提交于 2019-12-06 10:57:41
问题 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

Git submodule - How to keep the submodule updated when pulling from the main repo

帅比萌擦擦* 提交于 2019-12-06 07:32:38
We have the main git repository and one single git submodule. For this question, the main repository does only have a master branch, and the submodule does have two branches - X and Y . Let's say Coder A just switched to submodule branch X and applied some small changes. Coder B it's on submodule branch Y . Now A pushes to the remote and B pulls - then it does not seem like B 's active submodule commit (on their local machine) gets automatically changed to the commit that A pushed on branch X , even though A actively committed the changed submodule commit. Instead for B , their version on

Does Git delete empty folders? [duplicate]

三世轮回 提交于 2019-12-05 19:24:51
问题 This question already has answers here : How can I add an empty directory to a Git repository? (33 answers) Closed 2 years ago . I've committed and pushed a project to my GitHub account. This project contained the following partial file structure: server | --- conf | ----- some files | --- java | --- lib The java and lib folders are empty. When downloading my project from GitHub, the resulting zip did not contain the java and lib folders. Does Git delete empty folders? I am using Atlassian's

LFS: Git credentials for..XXXX..not found. Your user name must be of the form DOMAIN\\user

谁说胖子不能爱 提交于 2019-12-05 19:13:11
So we are trying to setup GIT LFS with on premises TFS and we are having a couple of errors. The errors and setup are described below: Setup: 1) On-premises TFS 2017 w/Update 1 2) Visual Studio 2015 w/Update 3 3) Atlassian SourceTree (Git Client) 4) GIT LFS is installed on the developer's system 5) The Git Credential Manager for Windows (GCM) Errors: Going to Tools->Options->[Git Tab] in SourceTree and selecting [Use System Git] and trying to checkout a version of the file from history results in the following error: git-lfs/2.0.1 (GitHub; windows amd64; go 1.8; git 678cdbd4) git version 2.12

Sourcetree fails to open Diffmerge for merge conflicts

♀尐吖头ヾ 提交于 2019-12-05 17:58:09
Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it. My settings page in sourcetree: This is how my root .gitconfig looks like when sourcetree configures diff merge for me: [core] excludesfile = /Users/[username]/.gitignore_global [user] name = ---- ----- email = -----@-----.-- [commit] template = /Users/[username]/.stCommitMsg [credential] helper = !/Library/Java

How to solve the requested URL returned error: 403 in git repository

喜欢而已 提交于 2019-12-05 07:20:23
I have multiple accounts in git I committed code three weeks back with this account. I'll unable to pull my code . I was getting The requested URL returned error: 403 I'll try Pushing to Git returning Error Code 403 fatal: HTTP request failed but I couldn't solved my error git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin remote: Forbidden fatal: unable to access 'https://chantidurgam@bitbucket.org/chantidurgam/patanjali.git/': The requested URL returned error: 403 Completed with errors, see above. Kunal I had the same issue when using the git cli and sourcetree - and doing

Can i set up SourceTree as external tool in Visual Studio to view log for current file?

♀尐吖头ヾ 提交于 2019-12-05 06:03:00
When right clicking a file in the SourceTree log I can choose "Log selected..." and get a log view for that specific file. Is there any way I could set up SourceTree as an External Tool in Visual Studio and pass it $(ItemPath) to have it open that log view for the current file. I'd like a way to to view the log for a specific file without having to find the file in a commit first. If possible I'd like to also set up the "Blame selected..." option from sourcetree as an external tool for the current file. I'm using SourceTree with Git and Visual Studio 2012. VonC Visual Studio 2012 means: either