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

learn more… | top users | synonyms (2)

54
votes
17answers
4k views

Alternatives to Professional Version Control

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
61 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 ...
-2
votes
0answers
28 views

Recommended SOA stack infrastructure and devops [on hold]

What would be the recommended way to implement the following requirements? ┌────────────────┐ ┌────────────────┐ ┌────────────────┐ │ SPA 1 │ │ SPA 2 │ │ SPA 3 ...
0
votes
2answers
128 views

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

I have some codes 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 codes in the folder ...
1
vote
1answer
85 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
82 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
475 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
2k 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
36 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 ...
-1
votes
0answers
23 views

Change git behavior when checking out branches with uncommited changes [migrated]

This question gives a lot of details about what git does when you checkout another branch while there are uncommitted changes. Is there a way to make git always ask you to either commit or stash ...
18
votes
3answers
2k 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 ...
87
votes
5answers
32k 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: ...
2
votes
2answers
40 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
825 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
88 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 ...
21
votes
8answers
9k 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
253 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
117 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 ...
106
votes
11answers
11k 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
97 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
72 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 ...
83
votes
4answers
14k 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
416 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
66 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
19 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
99 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
17 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
73 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), ...
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
2answers
86 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 ...
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
1answer
80 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 ...
9
votes
4answers
522 views

Is reference to bug/issue in commit message considered good practice?

I'm working on a project where we have the source control set up to automatically write notes in the bug tracker. We simply write the bug issue ID in the commit message and the commit message is added ...
25
votes
11answers
3k views

Should your best programmers have to check everyone else's code into source control?

One of the differences between svn and git is the ability to control access to the repository. It's hard to compare the two because there is a difference of perspective about who should be allowed to ...
0
votes
0answers
50 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
155 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
71 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
45 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 ...
2
votes
2answers
175 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 ...
3
votes
1answer
193 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
0answers
80 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
148 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 ...
6
votes
2answers
4k views

How do you structure your branches in TFS

My group at work has been trying to come up with a good process that we can use with TFS. I'm just wondering if some of you guys had some successful strategies with using TFS across multiple sites ...