0
votes
2answers
72 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 ...
2
votes
0answers
81 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 ...
-1
votes
3answers
96 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 ...
0
votes
0answers
111 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 ...
5
votes
3answers
158 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. ...
4
votes
1answer
384 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
332 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
200 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
3answers
248 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 ...
5
votes
4answers
261 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 ...
-1
votes
1answer
158 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 ...
16
votes
3answers
463 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 ...
20
votes
4answers
777 views

When should the VCS history of a project be deleted?

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 ...
4
votes
1answer
602 views

Structure of a Git repository

Sorry if this is a duplicate, I looked. We're moving to Git. In Subversion, I'm used to having \trunk, \branches and \tags folders. With Git, switching between branches will replace the contents of ...
1
vote
1answer
82 views

Strategy for versioning on a public repo

Suppose I'm developing a (javascript) library which is hosted on a public repo (e.g. github). My aim in terms of how version numbers are assigned and incremented is to follow the guidelines of ...
5
votes
6answers
723 views

Why are tools like git-svn that allow git to integrate with svn useful? [closed]

I have read these related questions: I'm a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS? git for personal (one-man) projects. Overkill? ...and I ...
1
vote
1answer
78 views

Keeping up with upstream changes while adding small fixes or even major changes

Often I need to apply some small fixes (to make them run on my environment) or even change some parts of the software (to tailor it to my needs) to software from outside. However this obviously ...
8
votes
2answers
422 views

How to structure git repositories for project?

I'm working on a content synchronisation module for Drupal. There is a server module, which sits on ona website and exposes content via a web service. There is a also a client module, which sits on ...
4
votes
3answers
572 views

Git workflow for small teams

I'm working on a git workflow to implement in a small team. The core ideas in the workflow: there is a shared project master that all team members can write to all development is done exclusively on ...
8
votes
4answers
436 views

How do professional application developers use version control systems, like GIT and Subversion?

I am a beginner developer and I have been wondering from the start, how do professional use tools like GIT and Subversion (I don't have a very good understanding about these tools), to fulfill their ...
-1
votes
1answer
587 views

Conceptual difference between Git and GitHub

The last line of this answer prompted me to ask this question . I know to know at a conceptual level the difference between Git and GitHub .
3
votes
3answers
302 views

What's the best way to manage reusable classes/libraries separately?

When coding, I naturally often come up with classes or a set of classes with a high reusability. I'm looking for an easy, straight-forward way to work on them separately. I'd like to be able to easily ...
11
votes
5answers
319 views

Why not commit unresolved changes?

In a traditional VCS, I can understand why you would not commit unresolved files because you could break the build. However, I don't understand why you shouldn't commit unresolved files in a DVCS ...
4
votes
2answers
144 views

I have a library and several small programs that use it: how should I structure my git repositories?

I have some code that uses a library that I and others frequently modify (usually only by adding functions and methods). We each keep a local fork of the library for our own use. I also have a lot of ...
3
votes
1answer
176 views

Tracking work history in a git repo

Previous related questions: Code bases for desktop and mobile versions of the same app Git branching and tagging best practices Question: I have split my repo into three directories (swing, ...
4
votes
2answers
1k views

Git branching and tagging best practices

I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I ...
4
votes
2answers
269 views

Which VCS is efficient for storing small changes to big text files?

A government agency publishes a text file with thousands of records. The entire file is about 60MB. Every day the file has about 60 new or changed records. We need to validate some info against that ...
20
votes
6answers
2k views

Specific reasons for still using Subversion? [closed]

I want to choose a version control system for my company. So far I know I have Git, Subversion and Mercurial. These days I see that Git is the most used, so I'm left wondering: would there be any ...
5
votes
5answers
285 views

What is the right way to version control a password protected archive?

I'm working with a local file which I always extract from a password protected archive (RAR), do some modifications/additions to it and overwrite the old file inside the archive with the new file (I ...
12
votes
1answer
876 views

Git workflow / practices for a small project (flowchart in png)

I'm trying to come up with a personal workflow. I've put together a flowchart of the hypothetical lifespan of a release: one developer pushing to a public github repo + a friend helping with some ...
22
votes
2answers
4k 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: ...
4
votes
3answers
517 views

version control security

We are looking for a version control tool. I personally think it's pretty cool to use Git. However, my boss recommends TFS. He told me it's much more secure to use an SQL Sever based tool, such as TFS ...
5
votes
1answer
422 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 ...
9
votes
2answers
370 views

Any reasons not to use multiple version control systems?

I'm working on a project which uses GIT as the main version control system for trunk, the official branches and most sub-projects/unofficial branches. As such, I want to make my own branch use GIT to ...
3
votes
4answers
331 views

Approaches to manage related binary files, apart from code

I'm working on a website for a photographer, the whole code is just a few files, and whole repository is a few MBs without the actual photographs. But, when I add the actual photographs to git and ...
4
votes
3answers
339 views

What is an effective git process for managing our central code library?

Quick background: we're a small web agency (3-6 developers at any one time) developing small to medium sized Symfony 1.4 sites. We've used git for a year now, but have previously used Subversion. For ...
8
votes
2answers
217 views

What is the canonical approach to using a VCS right from a project's infancy?

Background I've used VCS (mainly git) in the past to manage many existing projects and it works great. Typically with an existing project, I would check in each change I make to the code that either ...
10
votes
4answers
1k views

Using git correctly in a small team

What would be the easiest way to use git correctly in a small team of about 5 developers, with one server running the live application?
4
votes
1answer
387 views

Two git repositories, one project

I am building an app using Code Igniter, it is being based on CI-Bonfire. I am pulling in the dev branch of CI-Bonfire using git, I want the entire project to be git controlled as well, but I want to ...
0
votes
1answer
105 views

Tame a mess — backup & revisions across several systems? [closed]

I am a freelance mobile & back-end developer, and have many projects spread out over 4 systems - 2 Win7, Mac OSX and Ubuntu. Some of the projects need to be checked into the client's source ...
4
votes
1answer
826 views

Why do Git/Mercurial repositories use less space?

I've read on several discussions here and on SO that DVCS repositories use about the same or less space than their centralised counter-parts. I may have missed it, but I haven't found a good ...
2
votes
1answer
186 views

Can/Should I put my Git repository on a non-dev machine and keep it synced with the non-version control server?

I volunteer for a website, and well, basically, we don't have version control. We're working to change that, but because of several things, including the fact that I haven't worked with source control ...
3
votes
1answer
241 views

Command line merge conflict tools

I sometimes prefer to work in a terminal. I use git, and sometimes have merge conflicts. Are there any merge-conflict-resolution tools that work in a command-line only environment?
4
votes
3answers
251 views

Which revision control system to use for 2 semester capstone course? [closed]

For CS undergraduate students working on a 2-semester capstone course without any prior exposure to revision control systems, what would be a good one to use? Desirable qualities would be easy to ...
2
votes
2answers
251 views

Trac/SVN to DVCS Migration

The project I'm currently working on is using Trac, with SVN integration. It's worked great until now. Now, however, we've taken on some additional developers and we're running into issues with ...
-5
votes
2answers
393 views

Reasons to Use Version Control [duplicate]

Possible Duplicate: I'm a Subversion geek, why I should consider or not consider Mercurial or Git or any other DVCS? What is the value of using version control? I am a relative noob ...
18
votes
5answers
4k views

How do you achieve a numeric versioning scheme with Git?

My organization is considering moving from SVN to Git. One argument against moving is as follows: How do we do versioning? We have an SDK distribution based on the NetBeans Platform. As the svn ...
7
votes
3answers
862 views

Single-developer GIT workflow (moving from straightforward FTP)

I'm trying to decide whether moving to VCS is sensible for me. I am a single web developer in a small organisation (5 people). I'm thinking of VCS (Git) for these reasons: version control, offsite ...
4
votes
2answers
3k views

Examples of continuous integration workflow using git

Can anyone provide a rough outline of their git workflow that complies with continuous integration. E.g. How do you branch? Do you fast forward commits to the master branch? I am primarily working ...
15
votes
6answers
657 views

How can I refactor a code base while others rapidly commit to it?

I'm on a private project that eventually will become open source. We have a few team members, talented enough with the technologies to build apps, but not dedicated developers who can write ...

1 2