version-control

问题 I have created a bare git repo (lets call it repo #1) and cloned it. In the clone (repo #2) I have created several folders, one of which I have decided to make a git repo (repo #3). When I commit to repo #2, everything runs as expected exept that repo #3 is ignored (the .git folder, the files commit). How can I add repo #3 to repo #2 so that when I push repo #2 to repo #1, I can make a seperate clone of repo #1 in which I can also access the history etc. of repo #3? In other words. How do I

问题 TLDR : If X exists as a remote branch, then git checkout X should create a local branch of it. In my case, for a single branch, it does not. The remote repository has a master, release, and some other branches (say refactor-update ) I do: git clone WHATEVER/repo.git git checkout release But I do not get the normal branch switch message, nor is a local branch tracking origin/release created (per the man page for git checkout ). I am still on master. Note that if I do git checkout refactor

问题 This popular answers says you should commit the entire .vscode folder into source control ... so one of my team members did just that. However, I'm now finding that a file .vscode/symbols.json is destined to be committed. This file is a huge one-line json file, and I forsee impossible merge conflicts if I commit it. What's the take on this? 回答1: gitignore.io recommends ignoring everything but a few files: # Created by https://www.gitignore.io/api/visualstudiocode ### VisualStudioCode ###

问题 When you branch some code, finish working with the branch, and merge it back to the trunk, what do you do with the branch? Delete it from the repository? Keep it for reference? It seems like you would keep it for reference, but I imagine the /branches directory could get pretty cluttered. (If this isn't something people generally agree on, please comment and I'll make it a community wiki.) Clarification jleedev is right - we should specify which version control system we're talking about. I

问题 I have existing project in Visual Fox Pro 9 SP2. I added this project to source control over VFP IDE with MSSCCI provider integrated, then I added files to source control. Everything was ok, but then I update project list and error "cannot update project from project metafile" occurs. Same error is shown when I try join source controlled project to other workspace. There is problem with PJM file (error description on msdn), but I don't know how solve it. I did not change file manually, there

问题 Here are the steps: Added a repo to beanstalkapp. Added the repo from Preferences > Accounts in Xcode 5. Created a new project with local git. Selected Source Control > Push... Xcode shows me no remotes found. What am I doing wrong? 回答1: Xcode probably doesn't know that the remote belongs to your project. See if this works: Open your project in Xcode Head over to Source Control - Working Copies (your project) - Configure - Remotes. Can you see your remote there? If not, hit the plus sign at

问题 I need deploy my plugin into Nexus repository and create tag in my SCM (Subversion). In BuildConfig.groovy I wrote build ":release:3.0.1" in plugin section and set up repository: grails.project.repos.releases.url="http://my-nexus:8081/content/repositories/releases" grails.project.repos.releases.username="deployment" grails.project.repos.releases.password="deployment123" When I launched grails publish-plugin --repository=releases command, I get WARN: No SCM provider installed. If I fix this

问题 I'm developing a visual studio 2015 extension and I'm looking to get the identity of the user who's logged into the IDE (different to the user logged in to windows, or running devenv). I can't figure out where (or if) I can get that information. It doesn't appear to be in the DTE object anywhere and googling around hasn't helped. 回答1: Just the username string username = System.Environment.UserName; or string adName = System.Environment.UserDomainName; Full UserPrinciple System

问题 From the master branch I created a branch "topicA" for a project that is just a subset of the original files with a few new files added. To do this I created the branch, deleted the unneeded files, added some new files and committed. I then created a feature branch "topicB" and made some changes. E--H--I topicA / / K--L--M topicB / / A--B--C--D--F--J--N master I want the changes in "topicB" to be applied to "topicA". The resulting tree would look like: E--H--I topicA / K--L--M topicB / A--B-

问题 I'm trying to add a directory directly to a github repo, but the standard git add -A doesn't seem to be adding the folder for some reason. Normal pushes are working when I'm just adding files to the repo, but directories don't seem to be working for some reason. Do I have to be doing anything different to push directories? Thanks 回答1: The normal sequence should be git add yourDirectory git commit -m "add a directory content" git push Don't forget the git commit step. But, if the first step