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

learn more… | top users | synonyms

53
votes
7answers
32k views

What does 'stage' mean in git?

I find git hard to understand as I could not find the meaning of the words used for the actions. I have checked the dictionary for the meaning of 'stage' and none of the meanings were related to ...
0
votes
1answer
120 views

Gitlab workflow, forcing code review or merge request on branch

I'm working towards implementing Gitlab at my company with a workflow strategy. My idea is that developers will be given access to repositories but, anytime they try to commit, their code must be ...
6
votes
1answer
146 views

How to organize the dependencies of a project [closed]

I have a project built with Gradle, which contains libraries which can be used freely outside the main project, like this: The folders with a square at the bottom right are project modules. I want ...
0
votes
8answers
246 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 ...
1
vote
1answer
66 views

Easily moving both direction of time during a rebase

After I have written some commits, I very often git rebase -i over them, in order to test them, if necessary split them, take parts form one commit and squash them to another, more appropriate one. ...
-2
votes
0answers
78 views

Best free version control for use on local server with 10 different users [closed]

Which version control to use if I am not working through internet? We have a local server with few programs running on it. Around 10 users are there who connect to this server and update the program ...
6
votes
6answers
592 views

Git branches avoided by the office where I work [duplicate]

The place I work at does the following: They manage a dev version of an app They manage another replicate version of that app, they call this the rep version The live version of the app that is ...
-1
votes
0answers
16 views

Problem using Jenkins git-repo plugin [migrated]

git 1.9.4 is installed. Using repo plugin v1.6 When scheduling the build, I got this error message. fatal: cannot get https://gerrit.googlesource.com/git-repo/clone.bundle fatal: error [Errno 101] ...
0
votes
1answer
57 views

Database Password problem when using GIT to manage project that uses Spring to initiate Datasource

Program Situation I use Spring Framework to code my Web Service, using Dependency injection to inject a DataSource bean into the DAO bean that will be used by the Web Service. I have all the ...
5
votes
3answers
227 views

How can a manager ensure developers are pushing up to the origin every day?

Our team has been using Git for a couple of years. I love it, after previously using Visual Source Safe, SVN and TFS. However, my manager has been getting increasingly agitated about it and is ...
1
vote
2answers
163 views

Understanding and memorizing git rebase parameters

So far the most confusing portion of git is rebasing onto another branch. Specifically, it's the command line arguments that are confusing. Each time I want to rebase a small piece of one branch onto ...
0
votes
0answers
107 views

Can I use Git from the command line to manage an Android Project? [migrated]

I know that Eclipse has built in Git integration, but I'm so used to quick, simple Git commands from the command line. Does Eclipse manage a git repository any differently than is done through the ...
0
votes
0answers
51 views

How to commit code when using Composer? [migrated]

Scenario I have added my composer.json file and installed my dependancies. In this scenario we'll assume I've installed my dependancies into /Plugin. Now I find a bug in one of my packages and I ...
1
vote
1answer
66 views

Does it make sense to use tag without version numbers?

In our working group we had a discussion on using git tags in our projects. Some people argumented pro tags and some argumented against using tags. The crux is that we are talking about Magento ...
2
votes
2answers
49 views

How to handle versioning with multiple independent pull requests in a Git repository?

Let's say Alice has a Git repository, and the version is kept track of inside the repository (let's say package.json for npm). Bob sends a pull request to Alice which increments the version number ...
0
votes
0answers
42 views

Version Control & Deployment on Large Ecommerce Site

I am currently Front End Dev for a large ecommerce store and I'm wanting to switch the entire site to a Version Control System (Git) and Deployment service (Beanstalk). I'm having trouble ...
0
votes
2answers
122 views

Flaws in my PHP development setup - sharing sources causing lags

I have following development setup for my PHP projects: Working station running on Windows 7 with PhpStorm IDE. GIT for version controlling. CentOS on virtual machine (VirtualBox) with Apache and ...
6
votes
1answer
1k views

How to make a “git push” update files on your web host?

I have a few sites which are all hosted on the same web hosting service under shared hosting. My web host supports Git and I have SSH access to it, and I also have Git setup on my laptop as well. I ...
1
vote
2answers
87 views

Branching strategy for frequent releases [duplicate]

We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually ...
33
votes
8answers
4k views

Is it a good practice to use branches to maintain different editions of the same software?

We have a product that has a few different editions. The differences are minor: different strings here and there, very little additional logic in one, very little difference in logic in the other. ...
4
votes
2answers
100 views

Understanding branching strategy/workflow correctly [duplicate]

I'm using svn without branches (trunk-only) for a very long time at my workplace. I had discovered most or all of the issues related to projects which do not have any branching strategy. Unlikely this ...
2
votes
2answers
152 views

How to be Agile when new work keeps affecting completed work?

The project I'm working on is to re-skin an existing website. The functionality will stay the same, it's just the styles that are changing. In other words, I'm not modifying the HTML, only the CSS ...
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 ...
11
votes
3answers
2k views

Git Project Dependencies on GitHub

I've written a PHP framework and a CMS on top of the framework. The CMS is dependent on the framework, but the framework exists as a self-contained folder within the CMS files. I'd like to maintain ...
27
votes
4answers
4k views

Is backing up a MySQL database in Git a good idea?

I am trying to improve the backup situation for my application. I have a Django application and MySQL database. I read an article suggesting backing up the database in Git. On the one hand I like ...
1
vote
2answers
239 views

CI runner on same server of GitLab?

I'm setting up a GitLab server in my company and now I'm adding GitLab CI to it. Before start this task I'd like to understand if there are any disadvantages running my runners on the same server ...
6
votes
3answers
161 views

Advice Needed: Developers blocked by waiting on code to merge from another branch using GitFlow

Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to ...
22
votes
3answers
4k views

Organizing Git repositories with common nested sub-modules

I'm a big fan of Git sub-modules. I like to be able to track a dependency along with its version, so that you can roll-back to a previous version of your project and have the corresponding version of ...
27
votes
10answers
2k views

Do DVCSes discourage continuous integration?

Say there is a team of ten agile developers. Every day they each pick a task from the board, commits several changes against it, until (by the end of the day) they have completed the task. All ...
4
votes
1answer
159 views

How can I group commits in a version control system such as git

Instead of a one long flat commit history, why isn't there a hierarchy, so at the top level you might have pull requests, then you could go down a level and look at the commits in that PR. I realise ...
2
votes
0answers
66 views

Is licensing an issue for Git Submodules?

For example: an MIT-licensed project wishes to simplify the build process for its users by including part of the GNU toolchain (which is of course GPL) as a Submodule. Could that be interpreted as ...
20
votes
2answers
610 views

How robust are Git commits when the power goes out?

One day I was using Git (I'm still using it) and the electricity went down while I was committing. When I (actually, the electricity) came back, the git repo was corrupt. I don't remember the exact ...
4
votes
1answer
93 views

Merging around 15 small Git repos of non-optional centralized web service components to a single large repo

In a centralized web service we break down the components into various small Git repos by software modules, e.g. authentication module, authorization module, data access module etc. (around 15 repos ...
0
votes
2answers
45 views

Should I use branches for example uses of a github repo?

I'm working on a Github repo called Designemplate at https://github.com/benwatkinsart/Designemplate and was thinking of developing some example uses of the CSS file to show how it's used. Should I use ...
0
votes
1answer
75 views

State-of-the art Mercurial workflows [closed]

Having solid git knowledge under my belt, I occasionally use mercurial, especially when patching a HG based project. I feel slightly uncomfortable, because my knowledge of mercurial is limited and ...
3
votes
2answers
115 views

Where can I find “SVN for Git Users” resources? [closed]

So I took a job where the firm uses SVN (but will be moving to Git sometime in the future). The problem is that I don't know SVN. I've tried numerous Google queries and all I can ever find are ...
0
votes
2answers
130 views

Git: Branch or Fork?

I have game project that will have two versions: A simple version of the game, the core An advanced version of the game. I have the 1st version in my public repository and only I will be working ...
0
votes
1answer
64 views

Strategy for maintaining offline repository safely using git [closed]

I use git for versioning. Just yesterday I was working on refactoring my Python code base. After adding a test I found that I had introduced a bug in one of project euler solutions. So I checked out a ...
24
votes
2answers
5k views

Empirical Evidence of Popularity of Git and Mercurial

It's 2012! Mercurial and Git are both still strong. I understand the trade-offs of both. I also understand everyone has some sort of preference for one or the other. That's fine. I'm looking for ...
29
votes
4answers
10k views

Are there any statistics that show the popularity of Git versus SVN?

I'm writing an essay, and would like to have some empiric evidence, perhaps longitudinal data where the popularity of these technologies is compared over a period of some years. Are there any ...
1
vote
2answers
174 views

Git alternative to a shelveset in TFS

I use git for my personal projects, so I have never run into any issues with Git, however I had a discussion at work today and its something that I haven't thought about. In TFS you can store your ...
14
votes
7answers
8k 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
124 views

long lines in git or svn

I am coding a program which has persistent data (the MELT monitor, related to GCC MELT). The data is persistent because it is expected to be read and overwritten by most executions. (That data is in ...
0
votes
2answers
477 views

Script/tool to import series of snapshots, each being a new edition, into GIT, populating source tree? [closed]

I've developed code locally and taken a fairly regular snapshot whenever I reach a significant point in development, e.g. a working build. So I have a long-ish list of about 40 folders, each folder ...
3
votes
2answers
257 views

What are good references for using perforce effectively when I am used to Git and SVN? [closed]

I have been using Git for a long time and before that Subversion. Now I am faced with a client that hosts their sources in Perforce. Its been troublesome and I do not feel I have a handle on things. ...
1
vote
1answer
82 views

How to organize repositories for a split library?

I have two libraries that implement a protocol: one provides tools for establishing a channel between two parts, and the other provides classes and tools for building and parsing the binary protocol ...
6
votes
4answers
1k views

people fork my project but don't fetch from upstream - what can I do?

Several people have forked my github repo but they have not fetched-merged from upstream. So my original repo has evolved significantly since the fork took place, and meanwhile these people are ...
2
votes
1answer
131 views

Git, rebase and stay synced with remote branch

I have something of an annoyance in my Git workflow. I do the usual thing where I branch off master, into a branch called feature. I work on this feature branch for a while, meanwhile possibly master ...
0
votes
1answer
119 views

In Git, is the use of a 'PRODUCTION' branch necessary and/or would it be feasible to have more than one of them?

A short summary of how we do branch managing: From the MASTER branch one or many feature branches can be made (for mid to long term development), when deploy-able changes have been merged to MASTER ...
5
votes
3answers
5k views

Pulling changes from master to my work branch?

There's two of us working on something. We're using this branch structure master dev-A dev-B We both work on separate branches (dev-A,B) and whenever we're done - we promote our changes to master. ...