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

learn more… | top users | synonyms (2)

3
votes
2answers
81 views

How to handle versioning with multiple independent pull requests in a Git repository?

Let's say Alice has a Git repository, and the version is kept track of inside the repository (let's say package.json for npm). Bob sends a pull request to Alice which increments the version number ...
0
votes
0answers
55 views

Version Control & Deployment on Large Ecommerce Site

I am currently Front End Dev for a large ecommerce store and I'm wanting to switch the entire site to a Version Control System (Git) and Deployment service (Beanstalk). I'm having trouble ...
0
votes
1answer
151 views

Why is the “app” folder now a (more) common pattern in web projects?

It might be related to the Yeoman project, or they might have adopted this from somewhere else, but it seems to be the default for all of their generators. Aside from Yeoman generators I've also ...
-2
votes
2answers
77 views

Is the string “1.2.3f4” a standard format for version numbers?

The game development package Unity uses the following version numbering scheme: {major}.{minor}.{patch}{type}{number} With the following known types: a = alpha b = beta f = final Some examples: ...
1
vote
2answers
173 views

Branching strategy for frequent releases [duplicate]

We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually ...
42
votes
5answers
2k views

Maintaining Two Separate Software Versions From the Same Codebase in Version Control

Let's say that I am writing two different versions of the same software/program/app/script and storing them under version control. The first version is a free "Basic" version, while the second is a ...
6
votes
2answers
119 views

Code base migration - old versioning system to modern

Our current code base is contained in a versioning system that is old and outdated (Visual Sourcesafe 5.0, mid 1990's), and contains a mix of packages that are no longer used, ones that are being used ...
0
votes
1answer
174 views

Your thoughts on Best Practices for Scientific Computing? [closed]

A recent paper by Wilson et al (2014) pointed out 24 Best Practices for scientific programming. It's worth to have a look. I would like to hear opinions about these points from experienced programmers ...
0
votes
0answers
27 views

Source control: projects which share a 3rd library which is still under development in RTC

this is not a new question for source control, but IBM's Rational Team Concert is a slightly different animal than Git, SVN, etc. We have a number of .NET web sites under development with Visual ...
1
vote
1answer
131 views

What Kind of Source Control Do High Security Projects Use? [duplicate]

I was just reading this slightly older post on choosing a good source control system when I started thinking about how different projects use source control. Where I work we've essentially moved ...
4
votes
1answer
127 views

Is licensing an issue for Git Submodules?

For example: an MIT-licensed project wishes to simplify the build process for its users by including part of the GNU toolchain (which is of course GPL) as a Submodule. Could that be interpreted as ...
4
votes
1answer
167 views

How can I group commits in a version control system such as git

Instead of a one long flat commit history, why isn't there a hierarchy, so at the top level you might have pull requests, then you could go down a level and look at the commits in that PR. I realise ...
-2
votes
2answers
157 views

Is the version problem a nightmare in programming? [closed]

Let say you are building an app and you are using the latest library verion from a third party (say ver2.jar). Then you saw an example written 2 years ago, but that example uses the ver1.jar Now in ...
0
votes
2answers
134 views

Using commit messages for time tracking

Some products can parse a special syntax in commit messages to extract additional data, such at time tracking information: https://confluence.atlassian.com/display/FISHEYE/Using+smart+commits To me, ...
1
vote
1answer
113 views

How to manage version control company wide? [duplicate]

Are there any industry standards or best practises on how to manage a rapidly changing code base? The types of applications I am developing always have a custom aspect to them. So there will always ...
0
votes
1answer
95 views

Which version management design methodology to be used in a Dependent System nodes?

This is my first question so please indicate if my question is too vague and not understandable. My question is more related to High Level Design. We have a system (specifically an ATCA Chassis) ...
29
votes
1answer
991 views

How to deal with a misnamed function in production code?

I've recently come across a Python library on GitHub. The library is great, but contains one glaring typo in a function name. Let's call it dummy_fuction() while it should be dummy_function(). This ...
2
votes
2answers
129 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
89 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
199 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
145 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
207 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
733 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
86 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
57 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
186 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
51 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
139 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 ...
87
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
1k 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 ...
0
votes
0answers
68 views

What workflow would be preferable when working with Cloud9 and Git?

I'm working with a small team developing a web app. We're using Cloud9 to make collaboration and portability as simple as possible, but it's making it a difficult to determine what would be the best ...
1
vote
2answers
109 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 ...
4
votes
4answers
264 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
119 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
52 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
113 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
88 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 ...
10
votes
5answers
3k 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
776 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
413 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
284 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
132 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
150 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
173 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
214 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
165 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
343 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 ...