How can I query git to find out which branches contain a given commit? gitk will usually list the branches, unless there are too many, in which case it just says "many (38)" or something like that. I need to know the full list, or at least whether certain branches contain the commit. ...
I have a problem committing a bunch of .jar files with eclipse. Maybe eclipse thinks they are text files and not binaries? If that's the problem, how do I check that? And how do I change it? If it is not, then what is it? ...
I have a project that contains many sub-folders at it's root. One of the folders really should have been put into it's own repository from the beginning. Is there a way to pull out the history for just that sub-folder and then put it into it's own repository? Thanks, Blake ...
Possible Duplicate: Best tools for code reviews Hi All, I want a code review tool , that is simple to use , nothing fancy and must be able to pull source or integrate with SCCS. Could be web based or a desktop client. I will be using this on linux. AIX would be preferable. Code i will be reviewing is perl, but that shouldn...
Consider the following scenario: I have developed small experimental project A in its own git repo. It has now matured, and I'd like A to be part of larger project B, which has its own big repository. I'd now like to add A as a subdirectory of B. How do I merge A into B, without losing history on any side? ...
At work, we are using ASP.net 2.0 and VSS. VSS is a beast, we are continually having issues with people checking out files and there is no branching - makes it crazy. I know SVN/GIT is mainly used by open source developers, are there any downsides to ASP.NET developers using it? I have been pushing for SVN internally, but am thinking GIT...
I am the only developer on this project. ...
In Git, how can I organize work to track local config files of a library, which is a git submodule? In details: the library has normal files that are tracked, and default config files that are in it's folder, but not tracked, in order to avoid resetting or overwriting them (they're listed in .gitignore). All the files are in lib's fold...
I'm looking to organise my source code file hierarchy. I'm a C# (.NET) developer and come from an only Windows background (no Linux/Mac). I plan on using Subversion for source control. This is what I've come up with: (from subversion view) Root of Subversion Repository CompanyName /ProjectCodeName 1---/Branches 1---/Ta...
I want to use git to manage some data on a remote server, so I set up a non-bare repository there. I can push to it without problems, and the repository itself updates but the actual files are not changed/added/deleted. I have to ssh into the server and do a git reset --hard HEAD to get the file structure to actually update. What's to...
I've used source controls for a few years (if you count the Source Safe years), but am by no means an expert. We currently are using an older version of Sourcegear Vault. Our team currently uses a check out and lock model. I would rather switch to a update and merge model, but need to convince the other developers. The reason the develo...
We've adopted the Entity Framework and we're finding that when multiple people make isolated changes in their individual source control branches, there are massive conflicts when they come together in a merge, resulting in broken model files. We're leaning in the direction of forcing exclusive check outs on the file, but I'd like to avo...
I've been looking into checkstyle recently as part of some research into standard coding conventions. Though it seems like it is perfectly suitable for brand new projects, it seems to have a huge barrier to adoption for already existing projects as it doesn't seem to supply a method of only checking new or edited code. Maybe I'm wrong?...
Hello guyz, I have a situation where i need to maintain version information of my builds. By googling i found limited information. one way is to create a version file on source control and keep updating. other is to use the source control revision number. final one is to use bamboo build number. i haven't implemented anyone of this befo...
What strategy do you use to avoid storing passwords in version control? Currently, I have development/test/production passwords saved in three different files and the appropriate file gets used during deployment. All this is committed to version control, but I'm not too happy with that since not all developers need to know those passwor...
I have two working branches, master and forum and I've just made some modifications in forum branch, that I'd like to cherry-pick into master. But unfortunately, the commit I want to cherry-pick also contains some modifications that I don't want. The solution would probably be to somehow delete the wrong commit and replace it with two s...
I apologize if this is not the correct site for this question. There can be arguments to put it on superuser, serverfault, or stackoverflow... I posted it here because source code control is so programming-oriented and it's a code-tweak. I am able to upload images to mantis issues. I'd like to tweak the mantis code or config to auto-di...
What is a regular expression I can use in Vim to find conflicts in CVS and possibly other version control systems? ...
Joel seems to think highly of daily builds. For a traditional compiled application I can certainly see his justification, but how does this parallel over to web development -- or does it not? A bit about the project I'm asking for -- There are 2 developers working on a Django (Python) web app. We have 1 svn repository. Each developer...
Which version control system would you recommend for: single user looking for simple, easy to use generally small simple projects working on windows usually coding python no server Use would be more finding old code than complicated branching situations. From other similar posts, Bazaar and Mercurial seem the best distributed versio...