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

learn more… | top users | synonyms

1
vote
1answer
84 views

How to enable non technical users to use GitHub

We're currently storing two Dynamic CRM solutions in Github and have triggers to automatically deploy these solutions once a change has been pushed to the master branch. This works really well in ...
8
votes
1answer
320 views

Are Git branches, in fact, “homeomorphic endofunctors mapping submanifolds of a Hilbert space”?

As we all know: Git gets easier once you understand branches are homeomorphic endofunctors mapping submanifolds of a Hilbert space Which seems like jargon, but on the other hand, All told, ...
0
votes
2answers
220 views

Organizing code in a 2 man team

I've been working with a buddy of mine on a school project. We forecast it'll take ~2 months, so it isn't a small scale project at all. Communication and splitting the work effectively has been a ...
33
votes
4answers
11k 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 ...
3
votes
6answers
474 views

How do you handle multiple developer configuration in a project?

I've been thinking lately about how I handle config changes between multiple developers on a project. Specifically here about a Laravel project in PHP, but I guess this applies largely to all ...
-1
votes
0answers
49 views

Git collaboration with pull request in a company

I am thinking of a way to do collaboration between coders in a company, suppose we have 2 type of servers: Production and Staging. Now we want to review all changes going to Production via ...
0
votes
0answers
37 views

Is it possible to build releases based on tags with a Continuous Integration system (such as Travis CI / Jenkins) [migrated]

After reading and asking about how to deal with git, Github, branching, versioning and tagging, it looks like the best way to denote a new version of software, is by marking the last commit of a ...
8
votes
4answers
258 views

How to use github, branches and automatic releases for version management? [closed]

I understand most of the basic Git/Github concepts by now, however I still have trouble understanding the bigger picture. These are some things that I have managed to get working so far: Push ...
0
votes
1answer
172 views

Git structure for java project

I know there are multiple posts on similar problems, so please be kind with me. I am asking for suggestions I have not thought of and for good advice. I have a java "project" that is structured in a ...
13
votes
4answers
585 views

Is using Git Stash as a workflow an antipattern?

I've recently been looking at how me and my team uses Git and how our workflows work. We currently use a feature-branch workflow which seems to work well. I've also seen some individuals on our team ...
1
vote
1answer
51 views

Git Submodule for untracked folder?

I have a git repository with a folder in it. The folder is listed in my .gitignore file. I cloned another repository into that ignored folder from github. I may want to work inside of the new ...
27
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 ...
1
vote
2answers
57 views

git workflow for separating commits

Best practices with git (or any VCS for that matter) is supposed to be to have each commit do the smallest change possible. But, that doesn't match how I work at all. For example I recently I needed ...
3
votes
1answer
87 views

How to cleanly add after-the-fact commits from the same feature into git tree

I am one of two developers on a system. I make most of the commits at this time period. My current git workflow is as such: there is master branch only (no develop/release) I make a new branch ...
5
votes
1answer
59 views

Coping with build order requirements in automated builds

I have three Scala packages being built as separate sbt projects in separate repos with a dependency graph like this: M---->D ^ ^ | | +--+--+ ^ | S S is a service. ...
0
votes
0answers
57 views

What is the problem git submodules are supposed to solve?

What is the problem that git submodules solve well? When should I use them? Or rather what is their use case? The only use of submodules that I have seen 'in the wild' has been when used to share ...
4
votes
1answer
290 views

Tracking contributions from contributors not using git

I have a central git repo located on a server. I have many contributors that are not tech savvy, do not have server access, and do not know anything about git. But they are able to contribute via the ...
0
votes
2answers
131 views

Why are these seemingly unnecessary merges happening in git?

Consider this screenshot from our development repository: We are relatively new to git, so things are still somewhat confusing. The question at hand: If you take a look at the commits by me at the ...
2
votes
1answer
180 views

GIT workflow for web development

Long ago the small team of web developer I work with started using git for web development. Back then we just committed to staging or master directly and then merged frequently between the two. It was ...
1
vote
3answers
151 views

How come centralized source control solutions don't do branching in place

With centralized source control like Perforce and SVN, when they create a branch, they create a whole new directory. However, git and other distributed source control solutions, in my experience, are ...
56
votes
8answers
36k 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 ...
-1
votes
1answer
47 views

What should be done on git while migrating new distribution and packet manager? [closed]

In the project I am working, we are using Freebsd and we are creating our software packages for it. Now we are planning to change distribution to Centos and rpm for packet manager. Since our codes ...
19
votes
5answers
2k views

As a sole developer (for now), how should I be using Git? [closed]

I have multiple projects on Git that I eventually want to bring others into. However, right now it's just me and I use Git and GitHub very simplistically: no branches and basically just using the ...
0
votes
2answers
116 views

How to best structure Git for our team [closed]

We're starting to develop many small web projects in our company, where mostly they will have one shared resource with some code pieces (SDKs, utilities and etc...) Our team is small (~5) but is ...
2
votes
2answers
204 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 ...
7
votes
2answers
863 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 ...
1
vote
2answers
75 views

How does one store a website's holding/maintenance page in Git?

I'm trying to tidy up the Git repositories for the few sites that I maintain. For each site, I usually create a separate branch in the repo that holds a "maintenance page" or "holding page", which I ...
-1
votes
4answers
182 views

What are some version control systems based on different concepts than Git, Mercurial etc? [closed]

Most of the version control systems I have used have a lot of similar functionallity for source code files: they work on their text content, diff using well known diff algorithms, the changes contain ...
2
votes
2answers
526 views

source code file system layout for 2 very similar projects (with git)

we're working on "two" android apps that are very similar; in fact, they're the same apps with different graphics and color schemes, slightly different configuration and one or two unique activities ...
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 ...
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 ...
3
votes
1answer
105 views

If a dependency is not in the maven repository should I add it to source control?

One of the jar files that I use in my code is not in the maven repository(and yes I tried to avoid using it). I have installed it locally so when I build the project it gets picked up by maven. I also ...
2
votes
1answer
1k 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
163 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
251 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
68 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. ...
6
votes
6answers
616 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 ...
0
votes
1answer
72 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
244 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
1answer
75 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
64 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
50 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
139 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
2k 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
108 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 ...
34
votes
8answers
5k 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
153 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
160 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 ...
57
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 ...
10
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 ...