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

learn more… | top users | synonyms

2
votes
2answers
117 views

What could be the use of forking a repository in a github's organization?

I'm trying to figure it out some nice workflow for our company, and we have so far the main repository on the github's organization account and we all, the members of the team working on the branches ...
0
votes
1answer
123 views

External repository moved from Sourceforge (SVN) to GitHub, now what?

We've been getting the head revision of the JEDI Code library for a while, we only use it a tiny bit so never have bothered to manage which version we're getting. The problem is they appear to be ...
2
votes
1answer
203 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 ...
1
vote
2answers
833 views

Summarize changes (insertions and deletions) in Git

I want to look at how my code base has grown over time. GitHub has a nice +/- display along the list of checkins which gives a sense of this. Is there something similar I can use with my Google Code ...
0
votes
1answer
307 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 ...
1
vote
2answers
390 views

Looking for good practices on managing branches and developers in Git [duplicate]

I a little while ago I joined a new development team and recently we had our first major release. We've used Git since the beginning of the project and by now are somewhat comfortable with it. ...
3
votes
2answers
710 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 ...
0
votes
1answer
243 views

How to find method and class usages along git repositories

We got some code in a git repository that's used along different projects (with git different repositories), the problem is that we got now so many different projects that's difficult to track which ...
1
vote
2answers
4k 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 ...
6
votes
3answers
686 views

Best github repository layout for snippets in multiple programming languages

I have to create a github-presence for an open-source organization. The aim is to distribute code snippets and reference implementations in different programming languages. These contributions are ...
1
vote
1answer
359 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 ...
0
votes
2answers
207 views

Working with Multiple Versions of Websites (Git)

I have a main template like website I have made that will allow me to quickly roll out and make new websites on demand when I need them, for my personal use. I'm wondering what is the best practice ...
2
votes
2answers
2k views

how safe/sane is it to use git for deployment on my webapp production server?

I started with sftp, then switched to WebDAV and I'm currently using rsync through ssh to deploy any updates/upgrades from my development server into my production server. I'm still not very happy ...
-1
votes
3answers
141 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 ...
2
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 ...
6
votes
3answers
235 views

How do distributed version-control systems deal with fragmentation?

Here is the scenario: X is the author of a software. X releases v1.0 on an open source license on Github and moves on. People interested in the software fork and improve the software. Now there are ...
2
votes
2answers
162 views

How can a beginning programmer begin to learn and apply testing best practices when developing software?

While learning to develop in PHP it has been easy enough that my short, one page, 20 line little scripts I could add "testing code" directly to my functions to figure out where I am or get close to ...
4
votes
2answers
4k views

Keeping git repositories on different hosts in sync

I am thinking about starting a small project and I want to make its versioning with git. Bitbucket seems a good option for me with their free plan. I want to use it as the main tool for working with ...
5
votes
3answers
555 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. ...
7
votes
2answers
2k views

When to separate a project in multiple subprojects

I'd like to know if it makes sense to divide the project I'm working on in two repositories instead of one. From what I can say: Frontend will be written in html+js Backend in .net The backend ...
5
votes
1answer
446 views

Why doesn't git merge adjacent lines without conflict?

I recently learned that when merging two branches in git, if there are changes on two adjacent lines git declares this a conflict. For example, if file test.txt has this content: Line 1: A Line 2: B ...
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
4k 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
227 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
594 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 ...
3
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
185 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
68 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
185 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
539 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
536 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
404 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
386 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. ...
4
votes
3answers
307 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
2k 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 ...
9
votes
2answers
3k 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
2answers
423 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
917 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
481 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
543 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
393 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
565 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
3answers
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
251 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
536 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
243 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 ...