version-control

问题 I recently started working on a project which uses Git for version control. I have to fix two defects, Defect1 and Defect2 . Fixes for Defect1 and Defect2 need changes to File1 and File2 respectively. These two files are unrelated to each other. I want to work on each defect in a separate Git branch. I created two branches, fix_Defect1 and fix_Defect2 , and want to work on them independently. The fixes are complex, so I cannot complete one fix and commit it before switching to the other. I

问题 Trying to push Xcode project to TFS (Git repository), i created local repository for my project in Xcode, then install Git Credential Manager from GitHub, then trying to connect repository from Xcode by adding remote or connect to git repository, but the error message is "Authentication failed because the authentication credentials were rejected." Would you please provide me with the correct steps. Knowing that TFS 2015 & Xcode 8.2 回答1: The easiest solution for me was to just add your local

问题 I'm considering how to do automatic bug tracking and as part of that I'm wondering what is available to match source code line numbers (or more accurate numbers mapped from instruction pointers via something like addr2line) in one version of a program to the same line in another. (Assume everything is in some kind of source control and is available to my code) The simplest approach would be to use a diff tool/lib on the files and do some math on the line number spans, however this has some

问题 Can I create app.config or web.config file that applies only to my developer machine, as opposed to using the default configuration files that are checked into source control? 回答1: You can have an app.config for each environment, if is this what you are looking for. Try this: http://www.hanselman.com/blog/ManagingMultipleConfigurationFileEnvironmentsWithPreBuildEvents.aspx 回答2: I would recomend using separate config files that are referred to by your app.config or web.config. For example in

问题 I'm looking for Version Control that warns a use when opening a file if that file is being modified by another user. Is this possible? We also use Microsoft Dynamics CRM 2011 and are looking to use some kind of version control for the javascript files. Does someone has experience with using Dynamics CRM and version control? Thank you for any information! 回答1: You could implement this in Team Foundation Server (TFS) or other version control applications that support single checkout. You will

问题 I have a repository with two branches, A and B . They are meant to be the same code, but aimed at different versions of the libraries they depend on. So A/file1.js might have a snippet in it like so: this.actor.bar(); whilst B/file1.js might have: // `bar` had its name changed to `foo` in version X.Y of library Z this.actor.foo(); Then I go along into A say and make a whole bunch of changes that are compatible with both versions of library Z and want to merge them into B . Is there any way I

问题 I have a project that I am developing built off CodeIgniter. The main part of the project is a private system I am creating, but I want to add it to source control, to gain all the associated goodies. Now I'm using Mercurial, so I did the whole hg init bit, so I've got the repository set up. Now, one of the things I've done is to make a library for CodeIgniter, which I use in this project. Now I want to make this library open, so I need a separate repo for that. For anyone unfamiliar with

问题 I'm developing on a local windows machine and have a git repository I'd like to push to my remote dev server (mysite.com) via ssh but I keep receiving this error: fatal: '/git_repos/tools.git' does not appear to be a git repository fatal: Could not read from remote repository. To clarify, I have created a folder on my remote server (git_repos/tools.git), and set up a new repo within it: git init --bare The folder is owned by "user" and user has full access privileges. I have then added the

问题 I was wondering if there are any source control systems that allow administrators to define custom keywords which are replaced on check in with different behaviours (i.e. similar to $Id$ or $Author$ etc.) I'm only familiar with SVN and CVS which have a set list of keywords, but there would be applications for something like $LineNo$ or $MyLicenceText$. I'm sure there would be other use cases. The idea would be to create a plugin architecture where the behaviour of a keyword could be defined

问题 Supposing I have following scenario: I cloned some open-source project, say from URL X. Now I have local clone of it. I made some changes to local clone to try things out and commited them locally. Now what I want is following: I want to get update from the open-source project X. Just get all its latest code, without my changes at all. But I want my changes to live somewhere in tag in history so I can get them later. And I don't want to separate clone for this, want it all in my one repo. For