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

learn more… | top users | synonyms (2)

1
vote
2answers
404 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
630 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
246 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
424 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
63 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
912 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
295 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
9k 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
210 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
513 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
465 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
632 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
181 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
2k 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 ...
7
votes
2answers
314 views

What is the preferred method for an application to get settings which should not be stored in version control?

Let's say an application I'm writing requires a password for something but I don't want that password to be saved in version control (so no hard-coding the password). What I've been doing is creating ...
1
vote
2answers
433 views

Service to prove authorship with trusted timestamp [closed]

This question is related with copyrights. The copyright is granted by default to the author of some code, however this requires to prove that some person is the "first" author of some piece of code. ...
6
votes
3answers
853 views

Manage version control with a central development server (LAMP)

I'm working in a small team with up to 5 (web)developers. Because our team is growing frequently and we ran into problems with multiple people working on the same code we decided to set up a VCS. ...
3
votes
2answers
386 views

Good Version Control Guidelines from a Development/Collaboration Perspective?

At our company we have started outsourcing some of our development. This has worked somewhat well. However, we are having a hard time getting them to properly use version control. They are familiar ...
23
votes
7answers
1k views

how to stay efficient when a build is almost always broken

I work in a middle sized team which shares the same source code and while have a continues integration in place, but as all of us has to work in the same branch, the build is almost always broken. ...
6
votes
1answer
374 views

Responsibilities of Build Script and Build Server

I need some clarifications on the responsibilities of the Build Script and the Build Server. I read several articles on the Net about continuous integration and builds. Including The F5 Key Is Not ...
0
votes
1answer
445 views

Is it possible to integrate MS Project Server with SVN

We have been using Hosted SVN + Fogbugz for our source control and task/issue tracking. Our developers are very comfortable with SVN and we are hesitant to switch source control (e.g. TFS) providers ...
21
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
3answers
1k views

Distributed Issue Tracking [closed]

Distributed issue tracking seems like a belting idea to me, but it has never really taken off in a big way. Is there a good reason for that? I am aware of: bugz everywhere too complex to set up ...
26
votes
5answers
2k views

Do I check generated code in to source control or not? [duplicate]

I'm developing a .Net application that uses google protocol buffers. Historically the application used the approach, advocated by the protobuf-net team, of decorating the classes with attributes ...
6
votes
3answers
198 views

Should a new class refactored out of an existing one have history pointing back to it's progenitor

If I split one class into two classes should both classes have history in source control tracing back to the original class that contained both; or should the new class be added as a new file without ...
5
votes
2answers
518 views

How to deal with undesired commits that break long-running release builds?

We ran into an unfortunate situation at work recently and I've been wondering what we can do to avoid similar problems in the future. We make embedded systems. The FPGA code is in one SVN repository ...
4
votes
2answers
421 views

Kiln - Mercurial and Git limitation [closed]

According to this blog post: Kiln now supports repositories accessible from both Git and Mercurial We decided that the awesome way would be to make Kiln fully bilingual. It stores every repo in ...
3
votes
2answers
1k views

Source control system for binary files [closed]

At work we have a legacy system written in Visual FoxPRO. Everything in foxpro is a table, even forms, so basically if you open a form file with a text editor you don't learn much. Does anyone know ...
4
votes
2answers
145 views

Is it a good idea to create multiple heads with Mercurial? [closed]

I just made a commit that I want to reverse, but I want to keep the bad commit in history. So, I hg update to the previous (good) commit. Then I keep working. This leaves me with a new head: the ...
3
votes
1answer
155 views

Contributor's actions after rejected pull request

Imagine, there is an open-source project with a Maintainer and a Contributor. Both of them have theirs repos exported to some repository hosting (github, bitbucket, sourceforge --- whatever, but they ...
4
votes
1answer
597 views

Is git-flow in the spirit of git? [closed]

The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
9
votes
5answers
429 views

Is it a good practice to have a remote branch for each developer?

Is it considered a good practice to have a remote branch for each individual developer in the project? We're using Git with the following branches: master release develop If each developer had ...
2
votes
2answers
474 views

Has anyone used git as a runtime datastore in their application? [closed]

I used to work on a document workflow system, and it basically implemented a half-baked version control system for documents; using a database for versioning information and a filestore for the files. ...
-3
votes
1answer
105 views

System for checking code comments relevance [closed]

When I write comments for auto generated documentation it can become irrelevant after a few changes of the method. Do we have any system to automatically check, prevent such situation and warn ...
0
votes
2answers
163 views

Feasibility of continuous delivery with a mixture of development platforms

What are the major obstacles (and potential solutions, if known) for implementing "continuous delivery" software development when an application relies on varied programming languages or modules... ...
3
votes
3answers
1k views

Can my GitHub and SourceForge account share the same repository?

I like that SourceForge can also let people browse your code using Git. But, before I even set up the project on SourceForge, I had a GitHub repository for it. Now that I have created my SourceForge ...
-1
votes
2answers
449 views

If I own an open source project why would I not host it on Github? [closed]

I've noticed that one rather well-known open source project (which I won't name so that noone focuses too much on that specific project) offers sources for download as a .zip via FTP instead of having ...
6
votes
6answers
596 views

Version control: Dealing with incomplete/broken code

It seems to be a generally accepted good practice not to push invalid, broken, or incomplete code. But one of the huge advantages of version control systems is that it gives you a remote place for ...
12
votes
2answers
1k views

When was source control invented?

I'm aware of many version control systems: CVS, SVN, TFS etc... I've googled for the very first "revision control/version control system" and seen various conflicting answers. When was source ...
5
votes
4answers
479 views

Git: rebasing on top of a refactor that affects the target rebase branch

Let's say I have a feature (topic) branch that I keep rebased on top of my development branch. During the course of the project (before merging in my feature branch), I decide that I need to make a ...
4
votes
4answers
768 views

Is Using Locking/Unlocking in Version Control an Anti-Pattern?

Recently I've started using Git at work. Previously I've only ever used VSS (which has some problems) and so far, Git is orders of magnitude better. The key differences here is that Git is ...
-1
votes
1answer
329 views

How to maintain lots of different variations for deployment, using Git for development

Although there are many similar questions here regarding using GIT for maintaining different versions, none seem to answer my specific case. I'm OK with how to use GIT to do my development, using ...
4
votes
2answers
236 views

How to manage releases with multiple features at different states?

We have a branching structure of: multiple dev branches for each major new feature Main branch, merged into from a dev branch once a feature is ready for testing Release branch, merged into from ...
7
votes
3answers
360 views

How should non-functional changes be committed?

I'm working a small-to-medium legacy codebase and when working on a ticket I will come across code that should be cleaned-up or that I need to clean-up just to be able to understand the follow of the ...
19
votes
3answers
580 views

Why does git allow you to “change history”? [duplicate]

Possible Duplicate: When should the VCS history of a project be deleted? I am experienced using svn and recently started learning git. I was quite shocked to learn that git has features ...
12
votes
7answers
987 views

Can branching ever be considered a bad practice? [duplicate]

Possible Duplicate: To branch or not to branch? A co-worker is against branching. I use branching all the time. I put the team onto a basic 3 branch system. I create my own feature ...
5
votes
3answers
562 views

Functional testing before code checkin

I am working on a project with legacy code where it does not have much code coverage. One of the idea to improve that is to enforce a rule that each code check-in must have test, not only test but ...
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 ...
25
votes
4answers
1k views

When should the VCS history of a project be deleted? [duplicate]

I just refactored my project's entire codebase. So much so that even though it uses most of the same code base, things work in a radically different way. If the old version was 1.0, the new one would ...
6
votes
3answers
205 views

Advice: Developing two projects where one is an extension of the other

The Two Projects I work at a pretty small software company, and I'm currently in a situation where I'm at the end of development for "Project A", about to start development for "Project B". Project B ...