It’s been almost 2 years since I originally posed this question. I’d do it differently now (as I mentioned in a comment above the question above). What I’d do now would be to instead commit my changes to the one file in my local repo (you can use the hg record extension to only commit … Read more
I don’t believe Visual Studio adds anything special for git integration. It just looks for the presence of the .git directory in the solution folder. Delete that folder, possibly hidden, and Visual Studio will no longer consider it a git project.
Here is the method I’ve used in the past with good success: /trunk – bleeding edge. Next major release of the code. May or may not work at any given time. /branches/1.0, 1.1, etc. Stable maintenance branches of the code. Used to fix bugs, stabilize new releases. If a maintenance branch, it should compile (if … Read more
I’ve worked with Word documents in SVN. With TortoiseSVN, you can easily diff Word documents (between working copy and repository, or between two repository revisions). It’s really slick and definitely recommended. The other thing to do if you’re using Word documents in SVN is to add the svn:needs-lock property to the Word documents. This will … Read more
Caution, SCM can refer to different meanings about Versioning: Software Configuration Management as explained in JimDaniel’s answer Source Control Management is same as Version Control and Source Control and VCS Moreover, people may use SCM to refer to other naming: Source Code Management as in Source Code Control System Software Code Management but this is … Read more
From my answer to a different question: Distributed version control systems (DVCSs) solve different problems than Centralized VCSs. Comparing them is like comparing hammers and screwdrivers. Centralized VCS systems are designed with the intent that there is One True Source that is Blessed, and therefore Good. All developers work (checkout) from that source, and then … Read more
As documented in the Plugins section of the pom reference: Beyond the standard coordinate of groupId:artifactId:version, there are elements which configure the plugin or this builds interaction with it. inherited: true or false, whether or not this plugin configuration should apply to POMs which inherit from this one. So just add <inherited>false</inherited> to the buildnumber-maven-plugin … Read more
A refers to the version your merge target is based on. If you Merge from branch to trunk, ‘A’ will be the previous trunk version. B is what you currently have in your local trunk folder, including local changes. C is the Version you wanna merge on top of B.
No Since this question was asked there is now an easy workflow to use NuGet without commiting packages to source control From your package manager console you need to install the ‘NuGetPowerTools’: Install-Package NuGetPowerTools Then to enable your projects to support pack restore you need to run another command: Enable-PackageRestore Now you are ready to … Read more
store everything you will need to build the project 10 years from now.I store the entire zip distribution of any library, just in case Edit for 2017: This answer did not age well:-). If you are still using something old like ant or make, the above still applies. If you use something more modern like … Read more