A programming discipline for tracking, storing and retrieving revisions of source code.

learn more… | top users | synonyms (2)

2
votes
2answers
144 views

Enforcing coding standards: What are the trade-offs of different methods?

Our team has recently agreed on some very light coding standards, and that we need a means of enforcing them. We already have a mature Continuous Integration practice including frequent, small ...
0
votes
1answer
125 views

Strategy for maintaining offline repository safely using git [closed]

I use git for versioning. Just yesterday I was working on refactoring my Python code base. After adding a test I found that I had introduced a bug in one of project euler solutions. So I checked out a ...
2
votes
0answers
217 views

Is database version control practical? [closed]

The topic of database version control seems to come up at my work and in social discussion more and more often. But the truth is, I haven't met anyone actually DOING it. The only thing Googling the ...
1
vote
7answers
161 views

How can I use different versions of an evolving library in different projects?

The problem I write a lot of exploratory code in my research. As I go along, I put functionality that I'd like to reuse in a central location. A project might look like this: ./mylib ./exploration ...
3
votes
4answers
241 views

Is storing software in the cloud with reputable vendors secure?

I have a team member who refuses to use any form of private source code repository on Github or Bitbucket due to "security concerns". As a result, we have a hard time sharing code with him. He ...
12
votes
2answers
934 views

Version number as a part of a file name

I see that some software have the version number included as a part of their file name, while others do not. I am more used to the latter type, and I think that is more popular, but I see the former ...
3
votes
1answer
89 views

Where to keep track of batch editing scripts?

It is sometime useful to write a script to perform a batch editing on several files in a source tree. Such a script is usually very specific and used only once. Such scripts can be used to rework ...
2
votes
1answer
58 views

Best way to migrate a series of code (v1, v2, etc) into a new VCS?

I am completely new to using VCS and haven't settled on Git or Hg, but I do know that I will be using it soon. My old project folder has versions of files labeled v1, v2, etc. How easily can I fold ...
0
votes
2answers
200 views

Should I use git for project files, other than the actual source? [duplicate]

I have a lot of small projects, and while their source code is backed up and tracked with git, I don't know what to do with the rest of the files associated with a project. These consist of small ...
0
votes
1answer
52 views

How using tab affects commands like diff

In the page at http://pear.php.net/manual/en/standards.indenting.php, it is advised to use space instead of tab as it causes issue with diff, patches. Here is the excerpt from the page. Use an ...
1
vote
1answer
166 views

Should we be using git branches or separate repositories?

So I have talked my employer into finally jumping on version control...up until now my experience with git has been for personal projects and freelance work where everything is on one server, or small ...
5
votes
3answers
1k views

How to prepare for rewriting an application's glue [closed]

Assume you have a project that (in your opinion) is mostly decently well written, modularized, etc. and you want to keep much of it's functionality. However, an essential portion of this project is ...
89
votes
10answers
6k views

What should I do when I've already waited too long between commits?

I was naughty... Too much "cowboy coding," not enough committing. Now, here I am with an enormous commit. Yes, I should have been committing all along, but it's too late now. What is better? Do one ...
2
votes
1answer
3k views

In git, is it a bad idea to create a tag with the same name as a deleted branch?

I have a project with a git branching model that roughly follows that of nvie's git-flow. Our release branches are named in a SemVer format, e.g. v1.5.2 Once a release branch is given the green ...
37
votes
16answers
6k views

Good idea to put bug numbers in a comment in the beginning of the source file? [closed]

Is it a good practice to put bug numbers in the file itself inside a header comment? The comments would look something like this: MODIFIED (MM/DD/YY) abc 01/21/14 - Bug 17452317 - npe in drill ...
1
vote
2answers
128 views

We use subversion - Should we place comments in my code anyways? [duplicate]

I brought up in a meeting an annoyance that code changes were not commented within the code itself. We use SVN (Subversion) for source control, and it was relayed to me that you can just go into SVN ...
5
votes
4answers
311 views

Techniques to avoid entangling git merges when working on an extensive change

I am absolutely miserable when I get in a situation where I have to merge other developers' changes into mine. When using git and working on a really extensive change, that happens a lot. When I ...
1
vote
1answer
121 views

How to deal with bad versioned software as SCM [closed]

I have been asked to be the SCM (Software Configuration Manager) in my company. I've read online documentation to learn what SCM is, what SCM does, etc. Currently, the company works with a version ...
0
votes
0answers
58 views

Handling large and small changes specific to a customer

I've been going back and forth on how to handle this best. The problem C# project consisting of WCF services used by a Flex application. A customer may request a functionality change that requires ...
2
votes
1answer
120 views

Where do I put the changelog to display the recent changes to the user?

I want to create a changelog for my application to display the set of recent changes to the user. But I'm not sure where I put it. Do I create a text file and write in it? Where do I put this text ...
2
votes
1answer
105 views

Does cherry-pick just pull changes into the current working tree as uncommitted changes?

My team uses Mercurial for version control. Our development / version control routine is: all been committing to the same branch pulling for changes and rebasing our commits locally before pushing ...
13
votes
5answers
5k views

Is it reasonable to use git only on my local machine?

Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...
17
votes
6answers
860 views

When should I stop committing to master on new projects?

Whenever a new project starts, it usually makes sense to start by committing straight to master until you've got something "stable", and then you start working in branches. At least, this is how I ...
11
votes
4answers
433 views

Moving a multi-GB SVN repo to Git

Currently my company has a Visual Studio solition in an SVN repo that's organized as follows: SolutionFolder (~3.5 GB) |-> SolutionName.sln |-> .. Some source code folders... (~250 MB) |-> ...
59
votes
7answers
5k views

At what point is version control needed? [duplicate]

I work in embedded systems. Right now, my organization has two full-time programmers and two occasional programmers. It's rare that the same project is worked on by two programmers. All code is stored ...
2
votes
4answers
299 views

Is it worth using VCS (Version Control Softwares) for hobbystic/small/personal projects?

The question is fairly self-explainatory. Is it worth using VCS (Version Control Softwares) for hobbystic/small/personal projects?
2
votes
2answers
144 views

Should I merge from the same branch or from a merge?

Kind of a best practices question: is it better to merge directly from the source to other branches or is it OK to merge from a merge? Using Subversion for source control. Scenario: Branch A has ...
3
votes
3answers
161 views

Should test fixtures be added to code repositories?

I'm unit testing some code that processes data from an external API. That external API serves up a large pile of JSON data. The right thing to do here, of course, is to use fixtures in the unit ...
3
votes
2answers
178 views

How is a committer expected to behave? [closed]

In open source projects there is typically a set of devs that have permissions to commit code - the committers -, and others that "pull request" or send patches, the "general public". I find a ...
2
votes
2answers
216 views

When did current source control management emerge? [duplicate]

The use of source control management tools is nowadays a standard practice in the software industry. Furthermore, it seems that there is quite a strong consensus (for deliverables) to have an ...
4
votes
2answers
179 views

Sharing only part of code with git

The situation I have code which has features X and Y. Bob needs access to the code to help develop feature X further. Normally I would allow Bob to clone the code, but the problem is that feature Y ...
1
vote
5answers
442 views

Handling one code base for multiple clients, with their own custom code

I am working on a CMS, in which we have multiple clients that use it, so the code is stored on their servers. Each client has the default code (user manager, pages manager etc), but every client also ...
3
votes
4answers
429 views

How to minimize merge conflicts when using non-lock VCS like git?

I have been using git for about four months now. While I like most of its features, I find it rather inconvenient that multiple developers can make concurrent changes to the same file and then a need ...
2
votes
2answers
50 views

Infrastructure-related additions in commit comments

For the sake of this question, let's agree on this definition of "good commit message" from here: Your comment should be brief and to the point, describing what was changed and possibly why. and ...
29
votes
5answers
4k views

Why do so many websites prefer “git rebase” over “git merge”?

One of the advantages of using a DVCS is the edit-commit-merge workflow (over edit-merge-commit often enforced by a CVCS). Allowing each unique change to be recorded in the repository independent of ...
0
votes
1answer
176 views

Does changing the name of a namespace count as a MAJOR change in semantic versioning?

I'm writing a C++ library, and according to this site here: http://semver.org/, I should increment the MAJOR version when I make incompatible API changes. Is changing the name of a namespace ...
5
votes
3answers
550 views

How to properly deprecate methods in Java?

Today I lost a method that I was using since my co-worker redefined it to take its superclass instead. So after synchronizing with the repository I had trouble. Would it had been better in this case ...
5
votes
1answer
152 views

Version control and data provenance in charts, slides, and marketing materials that derive from code ouput

I develop as part of a small team that mostly does research and statistics stuff. But from the output of our code, other teams often create promotional materials, slides, presentations, etc. We run ...
3
votes
1answer
428 views

Where should the database and mail parameters be stored in a Symfony2 app?

In the default folder structure for a Symfony2 project the database and mail server credentials are stored in parameters.yml file inside ProjectRoot/app/config/parameters.yml with these default ...
5
votes
1answer
877 views

Is there an established or defined best practice for source control branching between development and production builds?

I struggled in how to phrase my question, so let me give an example in hopes of making more clear what I am after: I currently work on a dev team responsible for maintaining and adding features to a ...
11
votes
3answers
582 views

How to refactor when all your development is on branches?

At my company, all of our development (bug fixes and new features) is done on separate branches. When it's complete, we send it off to QA who tests it on that branch, and when they give us the green ...
13
votes
1answer
455 views

Etiquette for editing someone's pull request

I own a repository on GitHub to which someone sent a pull request with one single commit. I only want to implement his solution partially, and use about half of the code changes the user made. What ...
3
votes
1answer
80 views

Could a reflog replace tags for bookkeeping?

My repository has a branch production and is filled with countless tags of the format production-20130101-1234 that point to what has been actually shipped on the given datetime. I think this ...
7
votes
6answers
784 views

Branching Strategy for Test Environment

We will be starting a new project this month. The project will be 1 year and production deployment will only occur towards the end of the project. We will be doing iterative development (1 month per ...
27
votes
8answers
1k views

good replacement for commenting out code? [duplicate]

It bothers me to see commented out code and it seems often-times a symptom of developers not being proficient in advanced source control features, but on the other hand source control does not really ...
0
votes
3answers
254 views

CSS File Editing for Teams? (how to avoid stepping on each others' feet?!)

I'm wondering if anyone has a good solution for when you're working as a team and there's a single file used throughout a project (like a styles.css file) and everyone needs to use it throughout the ...
7
votes
3answers
363 views

Should I store test files in source control?

I have a number of (large) test files that need to be maintained. This means access to their history is a requirement. Benefits Any new developers get the entire test suite with just a git pull. ...
28
votes
11answers
2k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
3
votes
1answer
1k views

TFS Branching Advice

I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
-1
votes
2answers
90 views

How to effectively share projects with other developers

I'm thinking of working with some other people on a c++ or java project. Usually for small projects, we collaborate mostly through emailing source code files back and forth, but on a larger scale, it ...