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

learn more… | top users | synonyms

1
vote
1answer
138 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
518 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 ...
1
vote
1answer
115 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
2k 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
289 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
357 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
12k 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
346 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
507 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 ...
4
votes
1answer
89 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 ...
2
votes
1answer
2k 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
241 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
100 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 ...
3
votes
1answer
214 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
160 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. ...
2
votes
3answers
99 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
434 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 ...
13
votes
4answers
2k 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
85 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
392 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
198 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 ...
47
votes
7answers
20k 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 ...
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
2answers
258 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
530 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
157 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
76 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 ...
22
votes
9answers
5k 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 ...
12
votes
2answers
4k 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
124 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
448 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
91 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 / ...
5
votes
4answers
304 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 ...
4
votes
3answers
347 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
163 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 ...
39
votes
10answers
10k views

Why “Fork me on GitHub”?

I understand how GitHub works, but one thing I've been confused about is, why almost every OSS project lately has a "Fork me on GitHub" link on their homepage. For example, http://jqtjs.com/, ...
5
votes
1answer
299 views

Team Git workflow working with a multi-project Sitecore solution using TDS

We are a team of 8-10 developers working on different parts of a Sitecore instance. In the past we've used SVN and more recently (and successfully) Hg, but are moving to using Git as our primary ...
-5
votes
2answers
556 views

Reasons to Use Version Control [duplicate]

Possible Duplicate: I'm a Subversion geek, why I should consider or not consider Mercurial or Git or any other DVCS? What is the value of using version control? I am a relative noob ...
1
vote
1answer
107 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 ...
1
vote
1answer
457 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 ...
1
vote
1answer
332 views

Commit projects individually or whole solution?

I am working (alone) on an application that is a music portal where you can search for artists, songs etc ... The C# solution consists of: a class library that contains all the stuff to access the ...
2
votes
1answer
95 views

Build number when supporting previous version

I am developing and maintaining a web-based application that's used internally at my job. I am the only developer and so I'm not really using branches; everything happens on the trunk. I do tag ...
17
votes
6answers
820 views

When should I stop committing to master on new projects?

Whenever a new project starts, it usually makes sense to start by committing straight to master until you've got something "stable", and then you start working in branches. At least, this is how I ...
7
votes
2answers
574 views

What's the best way to undo a Git merge that wipes files out of the repo?

So imagine the following the happens (and that we're all using SourceTree): We're all working off origin/develop. I go on holiday for a week. My coworker has been working locally for the past ...
1
vote
1answer
123 views

Additional actions in setup.py for install

Background So, I'm developing a project, and I'm writing setup.py script for it, using distutils. I'm using CPython3.3. I use some libraries that have invalid distributions in PyPI, so they have to ...
11
votes
4answers
430 views

Moving a multi-GB SVN repo to Git

Currently my company has a Visual Studio solition in an SVN repo that's organized as follows: SolutionFolder (~3.5 GB) |-> SolutionName.sln |-> .. Some source code folders... (~250 MB) |-> ...
2
votes
4answers
430 views

Private comments in git

I need to add a feature to some code in a big project and due to the complexity I find it very helpful to add detailed comments to many lines to keep track of what's happening. This is only for my own ...
1
vote
1answer
68 views

Is it possible to tag only a portion of a git push?

I'm very new to git, but last week I installed it, set up bitbucket, and pushed my current project to my first bitbucket repo. All went well and I'm pleased with git as a simple, powerful, yet free ...
30
votes
8answers
6k views

Can you recommend a good commit message template / guidelines to enforce in the company? [closed]

In Git it's possible to set and enforce a good commit template. Can you recommend (preferably with argumentation) a good commit template / guidelines to enforce in the company?