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

learn more… | top users | synonyms (2)

3
votes
1answer
1k views

TFS Branching Advice

I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
-1
votes
2answers
90 views

How to effectively share projects with other developers

I'm thinking of working with some other people on a c++ or java project. Usually for small projects, we collaborate mostly through emailing source code files back and forth, but on a larger scale, it ...
3
votes
2answers
83 views

Placing images into Git for a CRM

I have built this CMS that has the option to add entries to the database. Each entry that is created has about 5 to 10 new images showing the product for sale. Each image is about 150Kb in size. I ...
3
votes
1answer
262 views

Continuous integration and modifying existing UI automation tests

Our team is currently facing a situation where we are changing a feature that is in the product today. This feature has Selenium automation tests associated with it. We are performing a fairly major ...
4
votes
2answers
589 views

Git Staging: When to stage? What to do if modification occurs afterwards

I'm rather new to the broad world of Git. I have read the manual and have been practicing but I am confused about few aspects of it, which I couldn't figure out after searching for. I'm wondering: ...
1
vote
1answer
184 views

Using Git - better to do lot of incremental updates or one big daily update? [duplicate]

Ive just started working with Git (Github) in anticipation for an up coming project I'm project managing and designing and developing the front end of. One thing I couldn't work out is, is it ...
12
votes
4answers
847 views

Stopping developers committing to the wrong branch on DVCS

The problem I am on a software project which has about 10 developers, we share source code via Mercurial. We have a development and production branch per release. Repeatedly during the course of the ...
4
votes
2answers
290 views

Should I commit my generated parser to source control?

I'm using a parser generator to build a compiler. Should I commit the source files produced by the parser generator? I want to commit them to avoid a dependency on the parser generator during the ...
4
votes
4answers
260 views

Is there a name for the concept of a “cumulative checksum”?

Insofar as I understand it, tools like Git and Mercurial derive checksums from their data, and those checksums are used to derive other checksums used in aggregate, leading to a kind of accumulative ...
7
votes
2answers
834 views

Git for a solo developer [duplicate]

I'm a developer working on a Wordpress project. I work on this alone and I want to improve the way I use Git but I don't know where to start. Currently, I'm using git to commit all of the work that ...
6
votes
6answers
749 views

Should I be commiting code quickly and testing later? [duplicate]

I am a web and software developer involved in the creation of mobile apps. I am currently working on a project with a looming deadline. I am wondering if I should be committing code rapidly and large ...
-3
votes
1answer
260 views

Version Control for One Man Dev Team? [duplicate]

I recently began work at a small company as a lone software developer. Before I came no true documentation/version control/etc. was in place. The best they have is Microsoft Word documents and Excel ...
5
votes
5answers
627 views

Why one would commit changes to version control every three minutes?

The frequency of commits depend on two factors: the developer himself: some developers tend to commit often, others may spend hours without committing, the current work: the same developer may have ...
30
votes
6answers
1k views

Are Frequent Complicated Merge Conflicts A Sign of Problems?

On our team, we use Git as our source control. We have several areas of code that are almost independent but have some overlap. Lately we have been discussing workflows and approaches to using source ...
28
votes
4answers
844 views

Zero-knowledge code hosting? [closed]

In light of recent revelations about widespread government monitoring of data stored by online service providers, zero-knowledge services are all the rage now. A zero-knowledge service is one where ...
3
votes
1answer
196 views

How to manage pair- programming code check in user identification?

How do you identify users when a programming pair checks in code? I heard a complaint that, often a junior dev will be at the keyboard, using his/her account, but is not going to be the best person to ...
8
votes
6answers
577 views

How big should a single commit be? [duplicate]

A discussion has come up at work and I want to get the opinion of other programmers. During my time in college, we only used SVN for sourcecontrol. Everybody commits to the same server and all ...
1
vote
1answer
197 views

Under what conditions should I rebase rather than merge?

Here is, roughly, our structure of work using git, for web development. We have a master branch, and individual or groups of work are done seperately in branches, then merged in. A ticket (or ...
0
votes
1answer
260 views

Version-control friendly, append-only file format: “binary” or “text”?

I'm designing an append-only ("journaled") file format, and I'd like it to be friendly towards being stored in VCS (git/Mercurial/...). On one hand, I'd like if after each change, only delta ...
5
votes
3answers
2k views

Maintaining SVN history for a file when merge is done from the dev branch to trunk?

In my org, we use SVN for version control So for each build (done periodically), we merge the code to trunk from the development branch (all the developers checks in to this branch). So when we want ...
1
vote
2answers
218 views

Form, Fit and Function changes in relation to software

I am looking at configuration management and the idea of form, fit and function change can determine whether a change is minor or major. I wondered how this definition could be applied when doing ...
101
votes
11answers
9k 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 ...
-1
votes
3answers
210 views

Source control and compilation tool chain [closed]

I am a single developer working on a large system. I was recently informed that there may be an opportunity to recruit another developer or maybe two. I have incorporated source control into my ...
66
votes
6answers
5k 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 ...
2
votes
2answers
166 views

Feature code + infrastructure code - how to structure the commits / JIRA issues?

Say that you work on a feature described by a single JIRA ticket and during the work, you: Create feature-specific code like the GUI or specific use-case behavior. Some of the code was generic so ...
5
votes
1answer
148 views

Can the version of Git vary between team members?

We are about 40 developers working on the same code base and we use Git for version control. My question is: can there be problems if, for example, some developers have a much older version of Git ...
4
votes
3answers
379 views

Can we reduce confusion in line-based diff tools by annotating the code with some unique tokens?

Let's say I have procedure1() { --body of first procedure-- } Then I rename it into procedure2 and create a procedure1 above it: procedure1() { --body of second procedure-- } procedure2() ...
5
votes
2answers
254 views

Best practices for merging a new version of third party source into an old version you've made changes to

A project I work on uses source code that's been purchased from a third party. The source code is delivered to us in a zip file. We store this source code in version control (TFS 2010) and routinely ...
7
votes
2answers
1k views

How to convert a Bazaar repository to GIT repository?

We have a large bazaar repository and we want to convert it to a git repository. The bazaar repository contains the folders of each of the interns. Any documentation/code prepared by interns is ...
22
votes
6answers
2k views

What does “branching is free” mean in Git?

What does "branching is free" mean in Git? I hear this a lot whenever Git is mentioned in comparison to other version control systems. I haven't had the opportunity (?) to deal with others (SVN, ...
1
vote
1answer
113 views

Git tracks _lines_ of code. Is there something that track _words_?

In git if I change a character in a line the entire line is considered changed. I don't know much but stackexchange seem to track changes in a word-by-word basis in the edit history. Is there an ...
14
votes
6answers
1k views

TDD and Version Control

I am currently learning about TDD and trying to put it into practice in my personal projects. I have also used version control extensively on many of these projects. I am interested in the interplay ...
10
votes
2answers
398 views

Big project layout : adding new feature on multiple sub-projects

I want to know how to manage a big project with many components with version control management system. In my current project there are 4 major parts. Web Server Admin console Platform. The web ...
3
votes
1answer
1k views

Versioning Javascript Files in a Web App

I am currently building a Web application using a LAMP stack that relies on Javascript on the front end. As the app grows and expands, I naturally plan to expand and change the javascript files. I'm ...
3
votes
2answers
484 views

Branching strategy to avoid multiple release branches for different customers

I am currently thinking of the following branching strategy Main branch Development branch Feature branch Release branch Basically the whole idea is to have a release branch so that hot fix can ...
2
votes
1answer
267 views

What's a typical team size using a Git repo?

We've been using Git as our version control but as the team grows, there are more and more pains when it comes to getting all our changes onto a single branch ready for a deployment. I'm wondering ...
1
vote
2answers
372 views

How can I avoid editing conflicts repeatedly when merging from one to branch to another?

I have an SVN repository set up like so: trunk branches UAT QA DevelopmentTeam programmer1 projectA projectB programmer2 projectC projectD programmer3 projectE projectF projectG projectH Each ...
1
vote
4answers
575 views

How far do you trust automerge?

Suppose you're getting the latest version of a file from source control and a conflict occurs. There are four possible types of changes in the conflict: Yours Theirs Both Conflicting Naturally, in ...
3
votes
1answer
232 views

git tagging comments - best practices

I've adopted a tagging system of x.x.x.x, and this works fine. However, you also need to leave a comment with your git tag. I've been using descriptions such as "fixes bug Y" or "feature X", but is ...
0
votes
1answer
395 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
0
votes
1answer
60 views

svndumpfilter Multiple Versions

I have a few questions about the Subversion open source project. I know that there are multiple versions of svndumpfilter (2,3). What are the tradeoffs and benefits of each version? In other words, ...
3
votes
2answers
864 views

Third party libraries in an open-source C# project

I'm going to start an open source project from scratch, using git (via github) to manage the source. The project will be written in C# and will depend on at least two external libraries (more are ...
2
votes
2answers
280 views

How to avoid code duplication across unrelated projects [duplicate]

I'm a contractor at a large Telco where I'm usually working on several different projects at once. The VCSs I use (mainly git and mercurial) tend to make me keep the code bases for unrelated ...
6
votes
2answers
8k views

Best way to structure a Git repository for Maven

I need some advice on how to structure our projects in Git. We use Java and Maven is our build tool. Maven kinda assumes all of your projects have a common ancestor eventually. Maven can also be a ...
1
vote
2answers
203 views

Private Repository Management for Potential Employers

I have some projects that I do not wish to be viewed publicly (some of them are school course work), but I want to show them to my potential employers. Ideally, I would be able to generate some ...
1
vote
1answer
481 views

Using gerrit (or similar tool) on a team where multiple devs work on a single feature

We have a team of roughly ~8 devs who regularly work on the same feature over the course of a 3 week sprint. It isn't quite pair programming, but in our current workflow devs regularly push up ...
5
votes
3answers
357 views

Who should support and maintain development infrastructure?

I am interested to know what other peoples' experiences are with managing development infrastructure are. I am talking about things like the build server, the central git repo etc etc. Any ...
7
votes
2answers
597 views

Feature branches, beta branches, and scrapped features

I've been thinking a lot about best practices regarding branching in distributed version control systems such as git an mercurial (the two dvcs's I have experience with and use on a daily basis). The ...
-1
votes
3answers
174 views

GitHub access to repo: only with URL? [closed]

I'm finishing my dissertation and want/need to provide the source code of some analysis scripts I've used. I did all the version control with git. Because I want to publish the results generated with ...
3
votes
2answers
1k views

So I'm a developing a workflow with vagrant+git…does this make sense?

Relevant Background Details We've got two types of VMs (Utility Boxes & Web Servers) that developers need. We are going to be using git for version control. We have developers who have ...