Git is an open-source DVCS (Distributed Version Control System)

learn more… | top users | synonyms

3
votes
1answer
1k views

Should we use a Maven Multi-Module Project in our Scenario?

The Situation I'm currently working in project that develops several RESTful services that partly interact with each other. As an example: Service A uses Service B Service C uses nothing Service D ...
0
votes
1answer
3k views

SourceTree app, how do I know what is my current branch?

I have branched from my develop branch bugfix/issue2 to work on a bugfix. Now that it's done I want to merge this branch bugfix/issue2 back onto develop but it's asking me if I want to merge into my ...
2
votes
3answers
226 views

Using one repository for the foundation of another

I have an existing website theme that I have built. I've been using github to maintain this theme, let's call it dragon. We are changing the theme entirely but we're using the existing theme as a ...
4
votes
3answers
1k views

Git: rebasing and keeping current to a remote branch - accepted practices?

When developing on a long-running branch (here defined as living longer than one release), what's the most accepted practice(s) to keeping the branch current with its origin while keeping the history ...
1
vote
2answers
548 views

What is the netiquette for forking other people's open source projects? [duplicate]

I started to get more and more engaged in open source development and I was wondering if there are any guidelines on how to properly document and maintain a fork? For example, let's say you fork a ...
2
votes
3answers
2k views

Team switching from TFS Source Control to TFS with Git, not sure how to handle complex project structure

I've used git for my personal projects for years, but that's always working alone, not needing to branch much, etc. Our development team at work has decided we are definitely switching to git, and as ...
0
votes
2answers
141 views

How do I share different files in a git repo with different people?

In a single directory with a Git root folder, I have a bunch of files. I am working on one of those files, X.py, with my friend Alice. The other files I am working on with other people. I want Alice ...
5
votes
4answers
1k views

To integrate git versions as build numbers or not?

A colleague and I have been taking turns debating/discussing the issues/merits of integrating a version derived from the current git repository into our code whenever it builds. We think the merits ...
4
votes
2answers
183 views

Managing an undercover SVN repository

The project I am working on is version controlled by SVN, and the unspoken rule at work is to commit only when a new stable feature is added (in order to have a "clean" revision history with no ...
1
vote
0answers
67 views

Steps to open source a small project [duplicate]

I've been working for a couple of years on a small project, almost by myself, with the eventual help of some colleagues. The project is getting out of my hands, because the size of the code is growing ...
2
votes
1answer
184 views

Git Workflow - turning a local reposity into a “central” one

I have a local repository with a toy project that has turned out to be more serious than I had thought. So from a single development branch where I have carelessly committed, I have started to use ...
2
votes
2answers
442 views

How can I get git to clone untracked files

I'm new to git. I'm using a development platform called automation studio. This development tool creates all sorts of files and directories which it needs to maintain runtime and IO information for ...
7
votes
4answers
3k views

Git submodule vs Git clone

I am working on an opensource project on github. It has a subdirectory /Vendor in which it has a copy of several external libraries. Original maintainer of the project updated this directory with ...
4
votes
1answer
519 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
397 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
365 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. ...
5
votes
3answers
302 views

Using testing branches in Git

We have someone (let's call him Ted) that is responsible for testing new features and bug fixes. We're using Git and GitHub. master should be/is always deployable and development is where we ...
6
votes
3answers
1k views

code review with git-flow and github

With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
7
votes
2answers
2k views

Is a merging strategy like Git Flow really an anti-pattern?

My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
3
votes
3answers
407 views

Proper Git setup between designers and developers?

Basically we now have 2 developers for an iOS project, 2 developers for an Android project and 1 designer doing designs for both projects. Right now, the way we exchange designs and images is through ...
3
votes
3answers
862 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 ...
2
votes
6answers
472 views

git: having separate folder for development, why?

until now I was using dropbox as my main vcs (it is not, but for a single dev does the job pretty decent). However I decided to give git a go and see if it fits my needs. Today I was reading this ...
2
votes
3answers
522 views

Pushing a new version of a live web application in a Git based workflow

I have a question regarding workflow in web development. I'm building my project in Symfony, and it's in Git. Right now, I have three environments, dev (local), staging and prod. The project itself ...
5
votes
4answers
372 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 ...
2
votes
1answer
535 views

How can I clone an svn repository that changed layouts with git maintaining full history?

Problem I want to clone an svn repo with git-svn. The problem is the subversion repository changed layouts at r1235. Specifics From revision 1 to 1234, foo used the standard svn folder layout with: ...
13
votes
2answers
1k views

Workflow: Using binary document formats in Git without locks (moving from subversion)

We're a software consultancy with a multitude of projects for different customers. We traditionally use Subversion, but are currently considering moving to Git. A significant portion of the documents ...
-1
votes
1answer
241 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 ...
17
votes
3answers
527 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 ...
3
votes
1answer
224 views

Open sourcing an internal project that has confidential information in the old revisions. [duplicate]

Possible Duplicate: How to open-source a project whose git repository has copyrighted media in the history? Our company has spent a year working on an internal web application and has ...
24
votes
4answers
903 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 ...
7
votes
3answers
694 views

Branching breaks continous integration?

I think this article, A Successful Git Branching Model, is very well known among experienced DVCS users. I use hg mostly, but I would argue this discussion is fine for any DVCS. Our current ...
9
votes
2answers
5k 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 ...
3
votes
1answer
67 views

Is it safe to modify sources in repository while git svn dcommit is in progress?

I have a big repository and git svn dcommit takes pretty big time. Will my repo be in consistent state if I'll modify sources (without any git operations) while dcommit is in progress?
81
votes
11answers
18k views

Why is the sudden increase in number of Git submitters on Debian popcon graph in 2010-01?

Almost every article I've read 1 comparing Git and Mercurial it seems like Mercurial has a better command line UX with each command being limited to one idea only (unlike say git checkout). But at ...
4
votes
2answers
271 views

Collaboration using github and testing the code

The procedure in my team is that we all commit our code to the same development branch. We have a test server that runs updated code from this branch so that we can test our code on the servers. This ...
1
vote
1answer
99 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 ...
4
votes
2answers
3k views

Code review process when using GIT as a repository?

What is the best process for code review when using GIT? We have an external GIT provider (Unfuddle) and have caps on resource usage - so we can't have dedicated remote repositories for every dev. ...
6
votes
6answers
805 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 ...
2
votes
1answer
527 views

Best way to use GIT to maintain web application template

I am a sole developer and I have a web application template that I have created in Visual Studio. I am using GIT for source control, but only on my development machine. Presently I have a master and I ...
1
vote
1answer
97 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
772 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 ...
5
votes
3answers
1k 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 ...
9
votes
4answers
993 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
vote
1answer
2k 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 .
54
votes
11answers
7k views

Why learn git when there are GUI apps for GitHub?

Given that GitHub provides GUI apps for both Mac and Windows, what are the benefits of learning to use git from the command line? Currently I'm using their mac app to update my repositories, and so ...
13
votes
1answer
4k views

Gerrit code review, or Github's fork and pull model?

I am starting a software project that will be team AND community developed. I was previously sold on gerrit, but now Github's fork and pull request model seem to almost provide more tools, ways to ...
3
votes
1answer
1k views

Picking a code review tool [closed]

We are a startup looking to migrate from Fogbugz/Kiln to a new issue tracker/code review system. We are very happy with Jira, especially the configurability, but we are undecided on a code review ...
0
votes
1answer
310 views

Where does the git flow release message go? [closed]

When creating a release with git flow like: git flow release finish <branch_name> I'm prompted for a release message. I grepped around to see where this go, but no succes. Any idea?
3
votes
5answers
2k views

What's so difficult about SVN merges?

Possible Duplicate: I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS? Every once in a while, you hear someone saying that distributed version ...
1
vote
2answers
290 views

Forking an open source project using Git

There is an open source project that I want to fork for my own reasons. It currently has a Git mirror of its main SVN repository which I can use. What are the best techniques for forking a project ...