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

learn more… | top users | synonyms

1
vote
2answers
460 views

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

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 ...
5
votes
2answers
241 views

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

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
73 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 ...
1
vote
1answer
83 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
77 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
4k 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. ...
2
votes
2answers
239 views

Good practice to seperate Git Repo from published Repo?

We have a central Git repo from which developers fetch and push changes. They make changes on the default master branch. Our Continuous Integration (CI) tool builds artifacts off this default master ...
3
votes
5answers
163 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
0answers
33 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
73 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 ...
1
vote
1answer
116 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 ...
0
votes
2answers
53 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
74 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 ...
1
vote
0answers
41 views

Maintain git fork with changes

I have a public library on Github which works fine. However, I get questions to support some feature, which results in adding a dependency to my library. I want to avoid this, but I do want to look ...
0
votes
1answer
87 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
18 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 ...
1
vote
1answer
71 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 ...
-2
votes
0answers
46 views

My code refactoring cannot understand by git [migrated]

I have visual studio project, recently i refactor my project, so no code modified, the functions just moved to and from. But my git extensions(Visual studio plugin for git) reports lines are deleted ...
1
vote
7answers
109 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 ...
11
votes
2answers
2k views

Github-like “pull requests” without Github

I work as an analyst for a financial institution, which, due to data sensitivity, will not store any data in the cloud. However, I'm having some success getting my team to use Git for code management. ...
0
votes
0answers
14 views

Using Eclipse to interface with GitHub for non-supported language [migrated]

I use Git via Eclipse for source control on my Python and Javascript projects and find it really useful. I also use a piece of building energy simulation software, EnergyPlus and would like to use Git ...
0
votes
0answers
4 views

Visual Studio 2012 Git Tools [migrated]

I created a repository (private one) on github. I downlouded the Visual Studio tools for git. Then, I created a project on my laptop. I add it to source control (git). I made my first commit to local ...
2
votes
3answers
87 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 ...
8
votes
1answer
986 views

Is there any common naming convention for git commit summary? [closed]

I know I can write any words as commit summary. My commit summaries always like : "a bug fixed", "new function achieved".... However, when my project growing, I found my previous commit summaries ...
0
votes
0answers
34 views

No branches in SourceTree? [migrated]

I have a project on my PC, I want to host it on BitBucket as a Git repo. I've been using SourceTree to manage an existing project with other contributors, so I know the basics about modifying a ...
1
vote
0answers
42 views

characteristics of gource output [closed]

I'm looking at gource as part of our repo analysis. I've little experience in translating such information so I would very appreciate some pointers as to the characteristics of the output of the ...
0
votes
5answers
153 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 ...
12
votes
4answers
1k views

How to commit in-progress refactoring?

So, I have this big project, which is in the process of being refactored by me. I am changing a lot of stuff, so there is no chance to get it to compile some time soon. I am living in a special git ...
2
votes
1answer
77 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 ...
-1
votes
1answer
115 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 ...
0
votes
2answers
158 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 ...
33
votes
7answers
13k views

How to manage github issues for (priority, etc)? [closed]

I'm new to github, and am looking for advice on how to manage issues. I'm used to having priority and other ordering options but see that none exist. How do others manages issues during the ...
2
votes
2answers
865 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 ...
5
votes
2answers
160 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 ...
2
votes
1answer
334 views

Useful versioning scheme for a git project? [duplicate]

I have a small github project, which I need to add an option to to output some version number on the commandline. The problem is I have no idea how to "compute" the version number. Is this some ...
1
vote
1answer
96 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
47 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 ...
21
votes
9answers
4k views

Using Git in Enterprise environment [closed]

Git is an excellent version control system. If we exclude the fact that, it doesn't have an excellent GUI support, it's really good and fast. But the source controls like Clearcase has large support ...
15
votes
2answers
7k views

Git branching and tagging best practices

I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I ...
46
votes
2answers
13k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
1
vote
1answer
118 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 ...
7
votes
2answers
2k 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 ...
4
votes
1answer
101 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 ...
5
votes
1answer
524 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
1answer
78 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 ...
1
vote
1answer
77 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 / ...
4
votes
4answers
161 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 ...
5
votes
3answers
300 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 ...
2
votes
1answer
140 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 ...