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

learn more… | top users | synonyms (2)

1
vote
2answers
245 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. ...
14
votes
2answers
441 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
33 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 ...
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 ...
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 ...
1
vote
0answers
96 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), ...
3
votes
2answers
138 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
178 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 ...
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 ...
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 ...
2
votes
2answers
120 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
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 ...
2
votes
2answers
46 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
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 ...
3
votes
4answers
270 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)? ...
2
votes
2answers
158 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 ...
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
113 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
75 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 ...
11
votes
5answers
456 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
115 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
18 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
80 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), ...
3
votes
2answers
108 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
81 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 ...
0
votes
0answers
51 views

Git for web development on server, with “dev” and “productive” folders [duplicate]

This question has been asked before, but none of the answers could help me in my case. I am developing a web application in PHP and JS. The workflow as it is today is the following: There are two ...
1
vote
3answers
176 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
78 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
56 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 ...
1
vote
0answers
96 views

Separate Version Control repository as Binary Package repository?

(( The context I have is, but is I think not too important to this question: Windows only development; Visual Studio; mostly C++ with some .NET/C# )) (I think that) Binaries should go into Version ...
1
vote
2answers
175 views

Why does Jenkins warn you if you tell it to check for changes every minute?

In the past when I've set up Jenkins to look for version control changes every second by using the cron format of "* * * * *" (or something like that). When you do this, it gives you a warning and ...
0
votes
1answer
36 views

Usage of “bugfix” to refer to UI changes in branch names

If a user interface has an undesired look (elements not having padding or margins when it would be appropriate, etc.) and I implement a correction in a new (named) source control branch, would it be ...
0
votes
1answer
140 views

Repository strategy for multiple interconnected components with small differences

At my work we have multiple products.. productA, productB, ... these products reference multiple components. componentA, componentB.. there are also shared components sharedA, sharedB... etc.. which ...
2
votes
2answers
215 views

Should I backup gradle dependencies to git?

I always like to backup project dependencies myself in case they can't be resolved due to a down website or because certain versions aren't available for download any more. Should I trust the maven ...
1
vote
1answer
123 views

How to organize remote Git branches when team does single change releases?

I am a member of a project team with somewhat unusual (or at least from my perspective) release methodology and team dynamic. The way we have been doing releases is rolling out a single functional ...
1
vote
4answers
151 views

Why are FLOSS licences applied to files instead of diffs/deltas?

In the case of open source software development, where contributions build on previous work I would find it more sensible for each copyright holder to hold copyrights on the diffs/deltas he/she ...
0
votes
2answers
99 views

How do I organizing 2 different projects with shared code

I know there have been same question asked multiple times on the programmers stackexchange. I think my question is more specific and hence decided to start a new question. My current a project which ...
7
votes
3answers
199 views

Git, semantic versioning and how it fits into (my) a typical development timeline?

I'm working on a Q&A system and about to tag my current application with "1.0.0" for it's first official version/tag. It's about to be rolled out for beta testing to a limited test audience next. ...
3
votes
1answer
238 views

Is there some structured format for drawing source control branching diagrams?

Everyone on my team draws branch diagrams differently, including how branches exit or reintegrate to the parent, how cherry-pick merges are shown, and a host of other aesthetic choices. Is there some ...
1
vote
1answer
101 views

Using conditional feature compilation/inclusion for release versioning

I have been playing with the following idea: commonly when different release series (1.0.x, 1.1.x, development code) of a product are maintained in parallel one uses different branches within a ...
4
votes
1answer
94 views

In 'branch by abstraction', how would one do code review?

My manager recommended I consider the technique of 'branching by abstraction', in which, rather than creating feature branches, multiple developers work in the same version control branch, and ...
2
votes
1answer
808 views

Appropriate Git workflow for multiple active releases while handling hotfixes

I'm trying to choose a Git workflow that is most appropriate for our product. Here are the parameters: We do a few major releases a year, let's say 10 at the most We have multiple versions of our ...