How can I differentiate between two local branches in git ? How can I copy one local branch to another local branch ? In general how can I perform difference operation between two local branches on my server using git. I tried looking it up online but there is not enough documentation on that or there is not clear documentation on tha...
I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch. Is that possible? This is what I...
The scope of this is that we have three main projects. Some of the source files are shared between the projects. There are nearly 3 million lines of code (not including comments or spaces) that has grown over 20 years. We currently use Source Safe for our version tracking. But this is starting to fail us as we expand not only our pro...
When you use git rm --cached myfile it doesn't delete from the local filesystem, which is the goal. But if you've already versioned and committed the file, pushed it to a central repository, and pulled it into yet another repository before using the command, it will delete the file from that system. Is there a way to just remove the ...
Hi, Im using maven to build a multi module project. But some projects are in a different svn server. I know it is not a good practice, but that choice was made following some considerations. Anyway, everything works fine, but I'm not able to find a way to checkout projects from an alternate repository location. Is this possible? Than...
I'm working on a product which relies on several different projects each hosted in its own Git repository. When a release is made, it would be ideal for us to consistently tag every project that is involved in building the product - this includes the core code, libraries and build tools. Is there an obvious and sensible way to tag all ...
From the top, "source control" seems like a bad way to describe CA Harvest; it's a deployment control system, and it's actually pretty good at just deploying code. I've found it to be lacking when doing source control tasks, though. If you've used Harvest; what did it do right? what couldn't it do? what did it do with a workaround so...
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 i...
I've looked at git-new-workdir, but I don't want the history to be shared because the branches have a release-main relationship. That is, changes in the release branch I want to propagate to the main line, but changes in the main line I don't want in the release line. A common pattern for me is to fix a bug in the release line, integra...
I know how to configure the Mercurial signing extension. The problem that I'm having is that I don't want to sign each individual change set, I only want to sign revisions that introduce new version tags. That's easily accomplished locally, however I can't come up with a way to enforce this on the remote server. I'd like people to conti...
correct me if im wrong, but isn't distributed SCMs for OS projects while centralized SCMs are better for corporate/private projects? cause with eg. mercurial anyone gets an exact copy of the repository with FULL history features, while with centralized you only get the latest working copy. im more focused on private projects so i wonde...
I read at Joel on Software: With distributed version control, the distributed part is actually not the most interesting part. The interesting part is that these systems think in terms of changes, not in terms of versions. and at HgInit: When we have to merge, Subversion tries to look at both revisions—my modifi...
Coming from svn, just starting to become familiar with git. When a branch is deleted in git, is it removed from the history? In svn, you can easily recover a branch by reverting the delete operation (reverse merge). Like all deletes in svn, the branch is never really deleted, it's just removed from the current tree. If the branch is ...
It seems that I accidentally checked in my "gen" folder from an Android project (this folder contains the R.java generated class). When I realized I did this I deleted it from SVN and tried to ignore it. Now I am now getting the error... "Could not add gen to the ignore list! Working copy 'C:\code\guru' locked. When I try to ...
I think it is quite normal to have more than one binary in a project. However, with Eclipse CDT I don't know how to set up the IDE to get things done. I know I can create several projects - one per binary. And I know I can set the dependencies per project. However, I cannot regard them as one project in Eclipse. If I'd like to share the...
I want to revert changes made by a particular commit to a given file only. Can I use git revert command for that? Any other simple way to do it? ...
I've been a user of UltraCompare Pro since it first came out, and I think it's a very full-featured compare and merge tool. However, since I have been looking more closely into DVCS, I found that it handles three-way merges differently than (most?) other tools out there. So I wonder why that is, and whether I'm missing something because ...
We have a series of scripts that are used when building Apache. Specifically these scripts are used to: patch the vanilla source code, patch in customer specific functionality, build and install the Apache server, build customer specific modules, and create a custom install tarball ready for eventual deployment. N.B. The deployment o...
I have the unfortunate opportunity of source control via Borland's StarTeam. It unfortunately does very few things well, and one supreme weakness is its view management. I love SVN and come from an SVN mindset. Our issue is post production release we are spending countless hours merging changes into a "production support" environment....
We have a main web application that references several other projects. Do you check-in .csproj/.sln files into source control? If so, do you use these files for msbuild or do you just include *.cs to build your dll? Does ILMerge help in any way with performance? ...