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

learn more… | top users | synonyms (2)

1
vote
1answer
27 views

Maintaining multiple versions of a library that all need maintenance and development

I'm writing an interface to a lexicon in Java. I just started this project, and the lexicon is on version 3.8. When a new version comes out, say version 4.0, database columns may be renamed, removed, ...
1
vote
0answers
27 views

Git repo with lots of medium-sized images?

I've just used git-tfs to checkout a TFS repo into a Git repo. The .git directory comes to 2.33GiB, and the primary reason for this is a couple of large directories coming to about 650MiB each. Each ...
25
votes
6answers
2k views

Which DVCS (git or hg) is easier for programming students? [closed]

A bit of context: I'm in 3rd year of college. students are divided into teams of 4. Almost everyone will be working under windows (except a few like me who are on linux). As part of the school ...
15
votes
2answers
485 views

Is it good practice to store software version numbers in VCS?

A product version, such as v1.0.0.100, represents not only a unique production release of software, but helps identify feature sets and hotfix stages for said product. Right now I see two ways to ...
1
vote
2answers
248 views

How do you sync changes to the data in your database? [closed]

I am new to a team developing a very large web application. Prior to my start, the team had 0 automation in place and just did everything by hand. This was possible because they were only a team of 2. ...
0
votes
1answer
34 views

Ways of embedding static data with python application

I have several projects on Python I am currently versioning with Git. I also have the input-output data that is gradually changing over the course of the project. I need to be able to re-run my ...
0
votes
1answer
66 views

How do I bundle library files for use in branches?

I work at a company which has it's source code managed using subversion. Our code base is huge (800MB) but we want to work with branching. For what I noticed is that when branching, SVN just ...
97
votes
5answers
35k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
28
votes
11answers
7k views

How often should I/do you make commits? [duplicate]

I am a recent (as of yesterday) college grad - BS in Computer Science. I've been a huge fan of version control ever since I got mad at an assignment I was working on and just started from scratch, ...
3
votes
2answers
149 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 ...
6
votes
7answers
254 views

Under what conditions does it make sense to break code into many files, or merge them?

Just finished merging seven scripts into one, but got me thinking that I really don't have a formal logic for breaking scripts into pages, or why I'd merge them. Suggestions?
4
votes
0answers
63 views

What happens if dependency repository is deleted on GitHub? [migrated]

I own a GitHub repository, A. Repository B is another open-source project, which is owned by someone else. Repository A depends on repository B (repository B is a submodule of A). If the owner of ...
3
votes
2answers
139 views

Delete unused source code from the repository or keep an archive folder?

At our company, we have a single version control repos with a structure like this: /client1_product /client2_product /... /shared_lib1 /shared_lib2 /... After almost two decades of development, ...
16
votes
17answers
3k views

Why should I write a commit message?

Why should I write a commit message? I don't want to and i think its stupid every single time. A GUI frontend I use which will go unnamed forces you to do it. I hear other doing it every time even if ...
2
votes
2answers
162 views

How to encourage contributors to choose rebasing over merging?

Here's a chunk of commit messages from our repo. It's mercurial but I believe in this context git will be relevant as well: Viktor Bubnidze TEST: chat send url fix changeset Kate Gunicky ...
44
votes
8answers
7k views

Version control for independent developers?

Do you think it's worth it to use version control if you are an independent developer, and if so, why? Do you keep the repository on your own computer, or elsewhere, where it can serve as a backup?
1
vote
0answers
98 views

How to break TFS or Mercurial repository in some way with a bad commit? [closed]

I'm having an internet argument about Git, in which one of the points are that even if someone does something wrong (bad reset, bad merge, pushing rewritten history upstream or something like that), ...
5
votes
3answers
180 views

How do we control which features get released?

I'm working in an environment where we regularly start working on a feature and then are directed not to release it. We then create other features that we do want to release. My typical workflow is ...
27
votes
3answers
2k views

Version control practice for Rewrites

We developed a product (prototype) P_OLD in language X and we are now rewriting it from scratch as P_NEW in language Y. Since P_NEW and P_OLD are the same product: Should P_NEW just be a brach of ...
57
votes
9answers
6k views

Is committing/checking in code everyday a good practice?

I've been reading Martin Fowler's note on Continuous Integration and he lists as a must "Everyone Commits To the Mainline Every Day". I do not like to commit code unless the section I'm working on ...
3
votes
1answer
106 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 ...
0
votes
2answers
146 views

How to change the same code stored in several places after I improve one of them?

I have some code written in Matlab. I use the code in different folders which contains different data. Because I want to change some parameters for each different data, I keep the code in the folder ...
55
votes
17answers
4k views

Alternatives to Professional Version Control [closed]

We're teaming up with some non programmers (writers) who need to contribute to one of our projects. Now they just don't like the idea of using Git (or anything for that matter) for version ...
2
votes
1answer
70 views

Good idea to include test logs in software repository?

I have written a software in python with unit tests and system tests together with an other developer. The software is version controlled with git. Before we merge branches, we ensure that the ...
1
vote
1answer
94 views

Setting up Version Control on my Development Server

I'm looking into the possibilities of integrating Version Control so that me and my team can work on code at the same time without having to worry about overwriting each others work. Previously this ...
2
votes
2answers
123 views

Source control branch design for deployed environments

I currently work with a young team of developers using ASP.NET, TeamCity and Octopus Deploy. One of our developers thinks that our system is flawed and introduces the inability to test production ...
8
votes
6answers
478 views

To check-in small chunks and frequently, or to check-in large chunks but infrequently [duplicate]

Which approach is better when working with a source control software like TFS or VSS? I have experienced different approaches and I can't tell which one is better. Should we let developers decide ...
22
votes
12answers
3k views

Should developers be forced to check-in before leaving work each day, even if the code does not compile? [closed]

During a previous consulting position, the developers where told to check-in code on a nightly basis, regardless if it complied or was complete. Managers were afraid of losing any code and said now we ...
1
vote
0answers
42 views

What git process when it says “removing duplicate objects” on merging branches?

Git displayed "removing duplicate objects" after I merged a branch to another and noticed my .git/objects folder has significantly reduced (from 40.7 MB to 33.5 MB). Isn't branch just supposed to be ...
18
votes
3answers
3k views

Introducing a version control branching policy to a small team

I'm a contractor that has recently started with a firm. Team is 3 developers consisting of 2 junior to mid level devs, with another at the same level starting soon, and myself (6 Years xp). For both ...
2
votes
2answers
47 views

How to handle pull requests to original repo with changes dependent on a newer version of the compiler

I have a github project that I've forked. The original repo was written for a version of OCaml before version 4.02.1. The 4.02.1 compiler gives me various deprecation warnings which I plan on fixing ...
-1
votes
4answers
842 views

The need for source control software - Team Foundation Server? or something different? [closed]

Recently, Here at the company, more than one programmer was appointed in charge for a LightSwitch(C#) software development project and immediately there was a need of some sort of source ...
1
vote
0answers
93 views

Version Control for several projects

I've found several things about how to manage a data science projet with GIT but I didn't find something about how to manage a set of projects. In 90% of the case I'm working alone and over the ...
22
votes
8answers
10k views

How safe & trustworthy are hosting sites such as sourceforge, github or bitbucket for closed-source projects? [closed]

I am considering using sourceforge, bitbucket or github for managing source control for my business. I have open projects and I participate in open projects such as gcc. But I also have a business ...
6
votes
1answer
2k views

Should I commit regularly in new projects? [duplicate]

TL:DR; Shall I start comitting regularly small pieces of code in new projects? Even if I'm start from scratch and don't have any experience in what I'm using (framework, programming language, w/e)? ...
4
votes
4answers
1k views

Boss is afraid to use a version control system for new project, should I anyway?

See Superior refusing to use subversion My question is similar, but here are the main differences in my scenario: We are starting a new project from scratch, using PHP and web tech. There would be ...
3
votes
4answers
273 views

Why exactly is Git's pull and push approach better than Clearcase's locking and hijacking approach?

I'm trying to convince colleagues about using Git, and somehow it's hard to explain the advantage of doing a pull before a push, because just before pushing, some other developer has pushed his ...
2
votes
2answers
160 views

Git(flow) workflow for web development

In my (small) company, we are currently thinking about dumping our current versioning system (svn) and release procedures, which are crap TBH, and switching to git. It will mainly be used for one ...
113
votes
11answers
13k views

Strategy for keeping secret info such as API keys out of source control?

I'm working on a website that will allow users to log in using OAuth credentials from the likes of Twitter, Google, etc. To do this, I have to register with these various providers and get a ...
0
votes
0answers
14 views

Maintaining Software Variants [duplicate]

What is the industry-accepted way of publishing and maintaining an open-source project which has different "flavors" or variants, but basically uses the same codebase? For example, I am working on a ...
5
votes
2answers
114 views

How to incorporate a database into a branch-per-issue version control process?

We're hoping to move to a new branch-per-issue process with development. To prepare for this, a lot of research and experimenting has been happening in terms of version control, CI, and process of ...
2
votes
1answer
76 views

What's the correct commit message in a multi-project repository

Somewhere else there was a discussion on putting several projects in one large repository. My question is, how does a good commit message look in those type of repos? I usually prepend each commit ...
110
votes
17answers
6k views

Should I tell someone that their commit caused a regression?

When you track down and fix a regression—i.e. a bug that caused previously working code to stop working—version control makes it entirely possible to look up who committed the change that broke it. ...
66
votes
6answers
6k views

Why does git use hashes instead of revision numbers?

I always wondered why git prefers hashes over revision numbers. Revision numbers are much clearer and easier to refer to (in my opinion): There is a difference between telling someone to take a look ...
87
votes
4answers
15k views

What is the benefit of git's two-stage commit process (staging)?

I'm learning git and I've noticed that it has a two-step commit process: git add <files> git commit The first step places revisions into what's called a "staging area" or "index". What I'm ...
13
votes
3answers
4k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
11
votes
5answers
468 views

Version controlling a database's contents

I'm working on a web project that involves user-editable content, and I'd like to be able to do version-tracking of the actual content, which lives in a database. Basically, I want to implement ...
0
votes
2answers
71 views

Test and deployment environment design for small team

Question is about organizing dev environment for the web development. There is 2 things to deploy: web site and database schema We use SVN to keep track of source code We use RedGate tools to ...
0
votes
0answers
20 views

How do I remove the history from items that come from a branch operation in SourceGear Vault?

We are currently pulling down the Development version, renaming it to the release name, such as "2.0.0.0", and using "Add files/folders..." on the folder containing the Development folder, and adding ...
4
votes
1answer
117 views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...