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

learn more… | top users | synonyms

8
votes
4answers
6k views

How to evaluate moving to Team Foundation Server

My development team presently uses the following software in our workflow: JIRA Bamboo (Atlassian continuous integration) Greenhopper (Atlassian agile project management) Confluence Git, hosted on ...
0
votes
2answers
873 views

When should we clean up old, no longer used GIT branches? [duplicate]

We have several bugfix branches that are starting to pile up. They have been merged into master, and deployed to production. Is there a good benchmark for when these branches should be cleaned up? ...
10
votes
3answers
202 views

Which is better for small bug fixes and small features - naming branches by ticket number or naming them by feature description?

I am in the middle of a disagreement (cordial, of course) with my lead about proper branch naming. This applies to bug-fix and small feature branches, not long-running feature branches. For ...
4
votes
1answer
2k views

Organizing a git repository with several projects sharing code

I have several small projects running on different embedded hardware, and about 50% of their code is identical (typically some drivers, their operating system, and some libraries). I want to merge ...
24
votes
8answers
18k views

Using multiple Git repositories instead of a single one containing many apps from different teams?

I am migrating a 10-years-old big CVS repository to Git. It seemed obvious to split this multiple-projects repository into several Git ones. But the decision-makers are used to CVS, therefore their ...
1
vote
1answer
167 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 ...
5
votes
2answers
145 views

How can I look at a GitHub repository and know what version of the code to download?

I am new to GitHub and new to the open source world (coming from .NET). I have a media wiki site and want to install a Google analytics extension: ...
60
votes
5answers
4k 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 ...
4
votes
1answer
104 views

Need a transition from my workflow, or make it better / fix it

This is how I roll with git: I clone/fork something locally I create a new branch devel. This is supposed to be a quickfix branch. It is also supposed to be parent to all branches. I create a topic ...
-2
votes
1answer
119 views

GIT Permissions [closed]

There is something not clear for me and this is how to prevent other people read my code. The thing is that I want people create their own branches but not to view the other's branches. If someone is ...
5
votes
1answer
142 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 ...
5
votes
1answer
493 views

Best way to convert existing project to be open source in GitHub

I've been working on a personal closed source project for some time and would like to make it open source. I've never created my own open source project before so it will be a good learning ...
7
votes
2answers
945 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 ...
18
votes
6answers
1k 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
110 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 ...
7
votes
4answers
277 views

What should I include in my repositiory from IDE projects

I want to add a project which in this case is created in Netbeans but this question is general for most IDE's. It's simply, what should I include in my repository. For example Netbeans creates a ...
-2
votes
2answers
779 views

Will git whine if I create my projects in multiple directories? [closed]

I'm new to git (and github). I work in Java and Python. Right now, I manage my projects in only one directory - let's call it Code and the folder is on my Desktop. I want to group my projects by the ...
10
votes
2answers
372 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
3answers
2k views

Can you close branches in Git?

In Mercurial you can close a branch like this: hg commit --close-branch, this means the the branch will not be listed anymore but will still exist, and can still be listed if you use hg branches ...
0
votes
8answers
259 views

Applying commits into another branch without merging

I have two git branches with almost the same code, but some minor changes in order to support different platforms. I need to maintain these changes because I need them to run the software on ...
2
votes
1answer
253 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 ...
2
votes
2answers
122 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
128 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
207 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 ...
2
votes
2answers
1k 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
335 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
448 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
776 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 ...
1
vote
1answer
279 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 ...
3
votes
2answers
5k 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
801 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
401 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
223 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
154 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 ...
6
votes
3answers
236 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
166 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
5k 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 ...
6
votes
3answers
619 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
504 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
2k 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 ...
1
vote
1answer
5k 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
228 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 ...
5
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
647 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
144 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 ...
6
votes
4answers
2k 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 ...