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

learn more… | top users | synonyms (2)

2
votes
1answer
46 views

How to integrate modified generated code into the build process?

I'm using a code generator which has the following workflow: Configure stuff Generate code Modify generated code with user code at specifically annotated positions. If changes are required to the ...
12
votes
2answers
300 views

Continuous Deployment with gitignore

When doing continuous deployment with Git, how do you handle ignored files in gitignore? Those files are ignored for privacy reasons (i.e. don't want them pushed out to other remote repositories, ...
23
votes
6answers
857 views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
119
votes
9answers
10k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
12
votes
3answers
562 views

How can we keep track of which version of our code is in each environment?

My team currently uses a fairly simple branching/deployment process that looks like this: ┌────────┐ ┌────┐ ┌──────┐ Environments: │ DEV │ │ QA │ │ PROD │ └───────...
1
vote
2answers
54 views

Can version control systems use the filesystem log to capture changes?

I was trying to find a "perfect" syncing program between a network share and a local folder, when I realised that it's probably impossible to do it right unless all the filesystem operations were ...
0
votes
0answers
37 views

Is there value is putting test/build outputs under source control?

My colleagues insist on ploughing every bit of output data they can into subversion. I can't see the value in this practice and would much rather use a file system. The key offenders are build and ...
7
votes
2answers
778 views

Should we include Nuget PACKAGE folder in version control?

I would like to know In C# or VB.NET project should we include the PACKAGE folder (nugget package folder that is created to the root of my project that contain the nupkg files and other content) to ...
2
votes
2answers
76 views

Mercurial Branching from a branch

We are in a situation where the customer has requested an urgent deployment of the current features we are working on. These features are being developed in a mercurial branch named 'sprint 1' for ...
11
votes
6answers
547 views

How can we only include ready-to-be-released features in our production releases every other week?

I'm a software developer on a fairly large agile team (we have eight developers actively making changes to a single code repository). Every two weeks, we push a new version of our software to ...
2
votes
0answers
87 views

Justification for different code bases on different branches in the same repo? [closed]

Branches in git repos or similar are practically always derived from the same code base; after all, they're usually merged back in to master later. But, if you wanted your open source project on ...
2
votes
2answers
75 views

Workflow for chains of dependent pull requests to projects that depend on other projects

Suppose you have project A and project B, where project B depends on project A - let's say A is a library. And project A and project B live in separate version control repositories - either because ...
0
votes
1answer
87 views

Should source control file directory match solution/project namespaces?

My team is trying to decide how to best organize/structure our TFS directory. One proposed solution is to create a directory structure that will dictate the namespaces for our c# projects. For ...
5
votes
3answers
370 views

Does Continuous Integration imply one monolithic VCS repo?

I am part of a small team which develops several internal apps for our company. We are in a process of becoming more Agile, this especially includes lots of automated testing. Now we are in a ...
10
votes
2answers
303 views

Why do DVCSes seem to all have an irrational phobia of uncommitted changes?

Coming from a SVN background, one of the hardest things to get used to when working with DVCS systems is the way they all seem to regard any uncommitted change whatsoever like a ticking time bomb. In ...
6
votes
1answer
383 views

Version control of a website : dev/production front-end files

I'm trying to think of a better way to version control our website projects. Keep in mind I'm only a front-end dev so I don't have a profound knowledge of VCS. Workflows are changing, and past ...
1
vote
1answer
127 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
3answers
170 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 ...
2
votes
2answers
390 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. ...
17
votes
2answers
959 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 ...
0
votes
1answer
40 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
103 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 ...
2
votes
2answers
201 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 PROJ-...
4
votes
2answers
322 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, ...
5
votes
3answers
216 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 ...
1
vote
1answer
82 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 ...
0
votes
2answers
170 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 ...
4
votes
2answers
599 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 ...
1
vote
0answers
76 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 ...
2
votes
2answers
98 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 ...
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 ...
1
vote
0answers
115 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 ...
4
votes
4answers
625 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 ...
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)? ...
3
votes
2answers
497 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 ...
5
votes
2answers
154 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
91 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 ...
12
votes
5answers
916 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 wiki-...
0
votes
2answers
99 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 ...
5
votes
1answer
184 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 ...
0
votes
0answers
20 views

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

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 ...
0
votes
3answers
92 views

Handling source code table alignment

Sometimes there is need to have tables (big or small) in source code. ItemType const SomeTable[] = { // id name min max ITEM( 3, "Foo", 70, 180), ITEM(13, "Bar", 30, 50), ITEM(...
3
votes
2answers
228 views

SRS document and version control

When working on relatively small projects, but a software requirement specification document is necessary, is it a standard to include said document on version control systems or is it managed ...
1
vote
1answer
92 views

Second Mainline Branch to Abandon Source Control Misuse?

I just learned about Source Control this week and came to the realization that my team uses it plain wrong. One mainline to commit code to live. No other branches; that's it. Branching features ...
18
votes
3answers
3k views

Manager reading version control commits

Our manager is monitoring the Git commits on all of our projects; usually this isn't a problem, and I love the fact that version control provides a log of all work that's happening, especially for ...
1
vote
3answers
386 views

How to version control a running web application? [duplicate]

I am developing a web application in PHP and JS. The software until recently was only being developed on and not being used by clients, so I could just change the script files directly. After the ...
1
vote
1answer
133 views

How to manage legacy code in branches?

I have a website application which was developed and versioned using Git. A new version of the site was developed from the base of the older site. The 'legacy' site lives in master and the new ...
23
votes
7answers
2k views

Can I use GPL libraries temporarily for prototyping and make the future code closed source?

I am working on a prototype for a software system, which (at least at the start) will be closed source. In order to save time, I'm thinking of using (that is, statically linking) a library that is ...
0
votes
1answer
118 views

Why isn't the addremove recommended by default in Mercurial?

This is perhaps a question of strategy more than anything else. I am new to version control and I guess I should count myself lucky to have relatively more mature systems like Mercurial and Git at my ...