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

learn more… | top users | synonyms

2
votes
2answers
76 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 ...
6
votes
1answer
5k 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 ...
0
votes
0answers
54 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 ...
1
vote
1answer
70 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. ...
1
vote
2answers
163 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 ...
0
votes
2answers
175 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 ...
4
votes
2answers
362 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
161 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 ...
6
votes
3answers
302 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 ...
29
votes
4answers
6k 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 ...
4
votes
1answer
121 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 ...
4
votes
1answer
167 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 ...
20
votes
2answers
656 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
47 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 ...
4
votes
2answers
195 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
178 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 ...
1
vote
2answers
840 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 ...
0
votes
1answer
86 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 ...
1
vote
2answers
492 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 ...
1
vote
1answer
131 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 ...
2
votes
1answer
223 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
230 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 ...
0
votes
0answers
68 views

Ruby on Rails - branding

I am working on a website, which is to have multiple brands. The core functionality for all brands will be the same, however there will be a number of differences between them. Those differences may ...
4
votes
1answer
84 views

Git work-flow for uncertain premise (pending decision)

I am not quite sure, how to name my problem. But I will start with how I usually used git. I am working as a single developer on one git repository. Usually I make feature-branches from master, and ...
3
votes
5answers
311 views

Dealing with a large pull request

I'm currently working on a project with a team that's using a git workflow. It's fairly simple, master should be in a deployable state and branches are used to create features and hotfixes. Whenever ...
0
votes
2answers
138 views

Correct way to undo the past few git commits including a merge? [closed]

My team is working with git for the first time and has really messed up our git remote due to our inexperience. I'm trying to help educate them on git to solve the problem in the long term, but in the ...
2
votes
1answer
94 views

Two closely related projects — Two repositories or one?

Background I am coding two closely related Java projects. The first project is Single Facility Simulator, which simulates a very simple supply chain with a single facility. The second project is ...
0
votes
0answers
24 views

How to maintain an example project owned by an area-XX for each organisational area of my company?

My company is migrating from SVN to GIT. We have several projects in an only repository. Since SVN basically understands only folders and files, we have folders representing areas of the company, that ...
2
votes
1answer
149 views

When using “Github Flow”, what if my next feature depends on code from a pending Pull Request?

We are experimenting with "Github Flow", as defined here. In short, every change starts off as a well-named branch off of master. When it's done, you open a PR for that branch, it gets reviewed, and ...
1
vote
7answers
140 views

How can I use different versions of an evolving library in different projects?

The problem I write a lot of exploratory code in my research. As I go along, I put functionality that I'd like to reuse in a central location. A project might look like this: ./mylib ./exploration ...
2
votes
2answers
250 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 ...
2
votes
3answers
92 views

Adding svn support to our git repo

We have been using SVN for several years. Recently, we switched over to git, since some members of the organization pointed out that if our SVN server dies our team is toast. So far, we've got ...
1
vote
5answers
251 views

Git commit not finished but can't continue on that machine

So I was wondering what is the typical way that people handle working on a project with git and getting to a point where the work you have done is not committed and not in a form that should be ...
2
votes
1answer
81 views

Include ignored file in the git repository

Suppose I'm setting up a website, and there are loads of images. These images won't change. But I would like that when any members of the team clone the project, they get the images so that they run ...
0
votes
2answers
184 views

Should I use git for project files, other than the actual source? [duplicate]

I have a lot of small projects, and while their source code is backed up and tracked with git, I don't know what to do with the rest of the files associated with a project. These consist of small ...
1
vote
1answer
134 views

Should we be using git branches or separate repositories?

So I have talked my employer into finally jumping on version control...up until now my experience with git has been for personal projects and freelance work where everything is on one server, or small ...
0
votes
1answer
67 views

How do I properly add a reference from my Github project to someone elses in VS2013 on Windows 8?

I need to reference the latest version of Bouncy Castle in a project I intend to publish to Github. In my first posting of the code to Github, someone complained that I downloaded the entire Bouncy ...
-1
votes
1answer
272 views

See remote repository differences with a graphical tool [closed]

My GIT repo is stored on a remote Linux server that I'm accessing from my Windows PC through Netbeans. Once my changes are done I would like to review them quickly before committing. The server has ...
2
votes
1answer
945 views

In git, is it a bad idea to create a tag with the same name as a deleted branch?

I have a project with a git branching model that roughly follows that of nvie's git-flow. Our release branches are named in a SemVer format, e.g. v1.5.2 Once a release branch is given the green ...
5
votes
2answers
214 views

Do you have to rename the software when you fork a repo?

I forked a repo some time ago and created a few pull requests which went unanswered. Now, the software is MIT-licensed, and I kept the copyright notice there. Do I have to rename the software, or ...
4
votes
1answer
117 views

Make a change that is ignored by future merges

I have a git repository, and I'd like to make a "debug" branch. In the "debug" branch, I'd like to add a line: debug = true; But I want to make sure that any merges back to master ignore that ...
1
vote
1answer
441 views

How to use Git with ASP MVC Code-First Entity Framework [closed]

TLDR: What is an effective way to use Git to handle ASP MVC code-first EF? Which files need to be included for NuGet? Which files should be left out? We have an ASP MVC code-first Entity Framework ...
1
vote
1answer
95 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 ...
1
vote
1answer
86 views

Git Repository Setup

I am moving my companys source control from TFS to GIT. We have TFS currently defined as. Project Collection / / Client A / Product A / Product B / Product C / Client B / Product D / Product E / ...
1
vote
1answer
231 views

Is using external repositories PCI-DSS compliant

We are considering using BitBucket rather than hosting our Git repositories internally. Does anyone know if this breaks any rules of PCI compliance? I haven't been able to find much information on ...
4
votes
4answers
254 views

Techniques to avoid entangling git merges when working on an extensive change

I am absolutely miserable when I get in a situation where I have to merge other developers' changes into mine. When using git and working on a really extensive change, that happens a lot. When I ...
2
votes
1answer
157 views

Scaling up Git to Team Usage

For the last 3 years I have used git on an almost daily basis for all my pet projects and at work for small projects that were not in the global SVN repository. My workflow is quite similar to the ...
1
vote
1answer
97 views

Should I use git and mercurial in the same directory?

I am looking for a solution for having revision control on framework code and project code at the same time. If I am using a MVC framework, there may be specific directories where I should put my ...
10
votes
5answers
2k views

Is it reasonable to use git only on my local machine?

Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...