A programming discipline for tracking, storing and retrieving revisions of source code.
3
votes
1answer
239 views
Command line merge conflict tools
I sometimes prefer to work in a terminal. I use git, and sometimes have merge conflicts. Are there any merge-conflict-resolution tools that work in a command-line only environment?
27
votes
10answers
2k views
Writing commit messages as a solo developer?
On my projects where the repository is shared between me and other programmers, I always write commit messages even if I'm the primary developer.
But on those projects where I'm the solo developer ...
6
votes
2answers
169 views
Any recognized convention for repository changelogs?
We use TortoiseSVN, but we have no bug tracking system. I know, lame, but beyond my control.
There were times when svn wasn't in daily use.
Now I've had succeeded in pressing for using it regularly, ...
21
votes
11answers
1k views
Should I use a code repository if I am the only one working on a project? [duplicate]
Possible Duplicate:
Version control for independent developers?
I am not sure if I should use a code repository when I am the only one working on a project.
4
votes
3answers
251 views
Which revision control system to use for 2 semester capstone course? [closed]
For CS undergraduate students working on a 2-semester capstone course without any prior exposure to revision control systems, what would be a good one to use?
Desirable qualities would be easy to ...
2
votes
2answers
251 views
Trac/SVN to DVCS Migration
The project I'm currently working on is using Trac, with SVN integration. It's worked great until now. Now, however, we've taken on some additional developers and we're running into issues with ...
7
votes
5answers
832 views
How to keep Free/Paid version of the app separate in subversion
I have a paid application on the android marketplace, however, I want to release a free ad-supported version.
The easiest way I thought to do this was to set up a branch on my subversion repository ...
2
votes
3answers
357 views
Where does my database schema live in MVC?
I'm starting to check in the SQL files for creating/maintaining our database. Previously SQL files were kept totally separate from our codebase's version control.
I'd like to pragmatically store my ...
10
votes
5answers
2k views
What's the best way to review a code before it's committed to the trunk? (SVN)
What's the best way to review a code before it's committed to the SVN trunk? One idea that I am thinking of is to having the developer to commit his code to a branch and then reviewing his code while ...
8
votes
3answers
350 views
Should I add old code into my repository?
I've got an SVN repository of a PHP site and the last programmer didn't use source control properly. As a result, only code since I started working here is in the Repo.
I have a bunch of old copies ...
8
votes
4answers
410 views
On improving commit practices
I was thinking about ways to improving my commit practices.
Is there any co-relation between no. of source code lines and no. of commits?
In a recent project that I was involved in, I was going at ...
2
votes
3answers
305 views
Development processes, the use of version control, and unit-testing [closed]
Preface
I've worked at quite a few "flat" organizations in my time. Most of the version control policy/process has been "only commit after it's been tested". We were constantly committing at each ...
5
votes
2answers
402 views
Is it safe to install TortoiseSVN on production servers?
Small shop, few production servers, no test or development servers, all Win2k3 WEB based.
There is a need to keep versioned files on one of the machines. Is TortoiseSVN safe against exploitability, ...
7
votes
6answers
286 views
Is there a term for quasi-open source proprietary software?
Say a company wants to keep development of new features of a piece of software internal, but wants to make the source code for previous versions public, up to and including existing public features, ...
-5
votes
2answers
392 views
Reasons to Use Version Control [duplicate]
Possible Duplicate:
I'm a Subversion geek, why I should consider or not consider Mercurial or Git or any other DVCS?
What is the value of using version control?
I am a relative noob ...
1
vote
2answers
375 views
Best practices in versioning
I develop some scripts for data analysis in a small team. For the moment we use SVN, but not in a very structured way. We haven't even looked how to use branches even though we need this ...
18
votes
5answers
4k views
How do you achieve a numeric versioning scheme with Git?
My organization is considering moving from SVN to Git. One argument against moving is as follows:
How do we do versioning?
We have an SDK distribution based on the NetBeans Platform. As the svn ...
7
votes
7answers
1k views
What is the preferred tool/approach to putting a SQL Server database under source control?
I've evaluated RedGate SQL Source Control tool (http://www.red-gate.com/products/sql-development/sql-source-control/), and I believe that Team Foundation Server 2010 offers a way to do this as well ...
9
votes
7answers
491 views
Version control and personal configuration file
Our project uses a user-specific configuration file. This file is currently not in version control, since it is different for each user. The problem is, whenever a developer adds a new module that ...
7
votes
3answers
855 views
Single-developer GIT workflow (moving from straightforward FTP)
I'm trying to decide whether moving to VCS is sensible for me. I am a single web developer in a small organisation (5 people). I'm thinking of VCS (Git) for these reasons: version control, offsite ...
4
votes
1answer
153 views
Are there any reasons not to use distributed version control in a corporate setting? [duplicate]
Possible Duplicate:
What does SVN do better than git?
In an effort to push coworkers toward a distributed VCS, I'd like to first understand why it is not a good change from a practical ...
4
votes
2answers
3k views
Examples of continuous integration workflow using git
Can anyone provide a rough outline of their git workflow that complies with continuous integration. E.g. How do you branch? Do you fast forward commits to the master branch?
I am primarily working ...
15
votes
6answers
654 views
How can I refactor a code base while others rapidly commit to it?
I'm on a private project that eventually will become open source. We have a few team members, talented enough with the technologies to build apps, but not dedicated developers who can write ...
2
votes
3answers
738 views
Any Code Review tool with direct connection to CVS?
I've found many Code Review tools:
Phabricator (by Facebook) - http://phabricator.org/
Rietveld (by Google) - http://code.google.com/appengine/articles/rietveld.html
GitHub - https://github.com/
...
12
votes
4answers
806 views
How should code “Goal Tending” be handled by a Development Manager?
First allow me to coin a term:
code goal-tending: Checking out code in the morning, then silently reviewing all of the changes made by the other developers the previous day
file by file, ...
7
votes
3answers
316 views
Training a company to use a DVCS coming from a CVCS mindset, is it as hard as one would think?
So, I'm preparing to consider the outcome of training a lot of people (>25) to use Mercurial coming from a centralized mindset. I've done it with individuals and had success with it, although the time ...
5
votes
2answers
347 views
Is switching from a CVCS to a DVCS a considerable bandwidth save?
So, I'm in a big geographically-distributed company, we use perforce and I'm starting to make the case for a DVCS with a whitepaper I was requested to write.
I was thinking that one of the arguments ...
4
votes
3answers
198 views
What quality level in the commit history can/should I expect/enforce?
I worked as a lone developer for a long time. During this time, I developed a way of formulating and ordering commit messages: Refactor first, describe exactly the reason for the commit in the ...
3
votes
3answers
360 views
Should we check in Setup Project of Visual Studio
From what I understand, the ideal way to prepare builds using Visual Studio is to use a single build machine. That means, while the developers go through development process using their respective ...
5
votes
5answers
202 views
DCVS and Bug Database
I am considering implementing the following policy and would like to run it by the community before implementing it:
All mercurial commits must have a bug id corresponding to our bug reporting ...
2
votes
1answer
1k views
Strategy for maintaining assembly references in TFS
I have a 3 branch setup: Dev, QA, Prod. There is a references folder where we store common 3rd party and internal assemblies. Change mgmnt has been challenging. Sometimes Devs forget to go into ...
4
votes
2answers
230 views
Is security a real argument for centralized version control?
I'm trying to understand if security is a real concern, or if distribution actually does a better job with security. See, the access to the main source repository could be layered and inherently ...
6
votes
3answers
323 views
What is the differences between committing and patching?
I am quite new to source control and would like to know the differences between committing and patching? Also, how/when a patch is use and can it be used on a web application?
1
vote
4answers
857 views
Is Visual Source Safe (The latest Version) really that bad? Why? What's the Best Alternative? Why? [closed]
Over the years I've constantly heard horror stories, had people say "Real Programmers Dont Use VSS", and so on. BUT, then in the workplace I've worked at two companies, one, a very well known public ...
1
vote
6answers
647 views
Should use of VSS be a dealbreaker in an employment offer?
I've been reading some of the horror stories about VSS recently, and it seems like a poor choice for anyone to continue to use. This is sort of a two-part question:
Are there any objectively good ...
7
votes
2answers
771 views
Github Organization Repositories, Issues, Multiple Developers, and Forking - Best Workflow Practices
A weird title, yes, but I've got a bit of ground to cover I think.
We have an organization account on github with private repositories. We want to use github's native issues/pull-requests features ...
8
votes
4answers
329 views
Can commits be considered too small? [duplicate]
Possible Duplicates:
git / other VCS - how often to commit?
How often should I/do you make commits?
The usage of source control is very different from one developer to another and from ...
2
votes
2answers
165 views
How do you handle minor change in source code causing discontinuity in version tree?
For instance, I have a file with poor indentation (at least incoherant with the rest of the project).
If I correct the indentation and commit, there will be a serious change in the file at a certain ...
2
votes
1answer
332 views
What is the difference between distributed and non-distributed version control?
What are the internal structural differences between distributed (e.g Git & Mercurial) and non distributed (Subversion) version control?
The question came from a discussion group where a tool was ...
2
votes
1answer
108 views
Versioning Within a Platform
I work with a few different web platforms, and my actual projects are typically quite small, and live within those platforms. The project files are scattered throughout the platform tree, which makes ...
5
votes
2answers
307 views
What should I do when I find sensitive information in version control?
Today I found what looked to be my supervisor's password in some code in version control. The password is to a database. He is very experienced and has explained before how to avoid having passwords ...
13
votes
6answers
480 views
What is the best way to allow a client to contribute to a project?
We've been building a CRM for a client. Now that the first major phase has been finished, and a second one agreed upon, the client would like to pick up some of the work, making minor amendments to ...
1
vote
0answers
404 views
How to properly approach a GitHub workflow as a solo developer? [duplicate]
Possible Duplicates:
Are there advantages to using a DVCS for a solo developer?
As a sole developer (for now), how should I be using Git?
I'm a solo developer, and I've been quite comfortable ...
5
votes
4answers
286 views
Source/Version control for application used by multiple companies
Do you find it easier to keep a branch for each company that uses software you support/develop? Each company will want "customizations" and I am just trying to figure out the best way to handle those ...
10
votes
2answers
691 views
A decent git branching model for products that should accompany the version of another, third-party product (and pros and cons of one proposal)
Note: My question is focused in my specific problem (which involves Liferay) but I hope it can be useful for anyone who needs to maintain various versions of a same project on git.
I work on a ...
8
votes
3answers
1k views
Source Control: Roles and Responsibilities - Best Practices
I'm looking for "Best Practices" concerning roles and responsibilities, specifically who is responsible for merges from development branches to trunk (or main). Basically I'm looking for ammunition to ...
9
votes
2answers
429 views
Why are developer commit statistics harmful?
I have long believed (and heard from others) that keeping track of commit statistics, such as how many commits each developer makes per day, is harmful to the development process. The reason seems ...
9
votes
4answers
477 views
How do I Integrate Production Database Hot Fixes into Shared Database Development model?
We are using SQL Source Control 3, SQL Compare, SQL Data Compare from RedGate, Mercurial repositories, TeamCity and a set of 4 environments including production.
I am working on getting us to a ...
1
vote
2answers
2k views
What fast, free SVN repository alternatives to Google Code are there for open-source projects?
I am using Google Code for my project which is almost a hobby project under the MIT license. The problem is, Google Code is too slow from my area.
So I am looking for alternative repositories. Can ...
4
votes
5answers
2k views
Choosing the right branching strategy for releases
Starting with a new dev team on a new project and we have to define our Branching strategy for our source repository (e.g. Microsoft Team Foundation Server 2010). We've run into a sticky discussion ...
