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

learn more… | top users | synonyms

0
votes
1answer
310 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 ...
0
votes
4answers
4k views

Searching in a repository

I'm very new to source control management and one thing puzzles me: is it possible to search through the whole repository for a string? For example I'm tracking one file, which has 100 commits and I ...
0
votes
2answers
1k views

New vs Clone Git in Eclipse with EGit

I'm not sure I have either my new repo or clone repo workflow, or both, setup correctly. When I create a new project I create a repo on github, can't clone from it as it's empty so I create a new ...
0
votes
1answer
108 views

An elegant way to store build counter [closed]

We use Git and Jenkins as our build&release system and each build is assigned a version number which looks like this: 6.0.12345. Here, the 12345 part is a counter which increments with each build. ...
0
votes
1answer
114 views

Using open source apps source code under Apache v2 [closed]

I modified some code and added few (minor) changes to an open source Android app. Now I want to publish it on play store. The app is licensed under Apache license v2. The license file is included in ...
0
votes
1answer
74 views

git workflow: read access + pull request or write access? [closed]

Suppose there is a small team with 1 senior developer and 3 junior developers working on the same repo in a team on a github organization. The senior developer has admin access. What is the most ...
0
votes
1answer
56 views

Upgrading inherited 3rd party code with changes [closed]

I inherited a php project of 3rd party code with a good deal of company-specific customization lumped on top of it. Now I've got to upgrade it and the person who owned the project is the one I've ...
0
votes
1answer
58 views

git strategy on merging/rebasing feature that was abandoned but is being revived

Say we have this situation: * master | * a | * b ... a lot has happened * ... a lot has happened * z | | * aa (want to rebase onto master or merge into master but having too many ...
0
votes
2answers
252 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 ...
0
votes
1answer
904 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
1answer
132 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 ...
0
votes
2answers
257 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...
0
votes
2answers
291 views

Github Workflow: Pushing small fix branches to remote, or keep them local?

In Scott Chacon's workflow (explained eg in this SO answer), with essentially two silos (development, and master), if, say I have a small bug to fix (e.g. can be fixed with a few characters) is the ...
0
votes
1answer
735 views

Why does Aptana need Git installed on Windows?

Why does Aptana Studio need Git installed on Windows?
0
votes
1answer
389 views

Recommendations to organize code changes in GIT

I'm looking for an advice reflecting my point of view. First, I will explain my point of view. My point of view I'm working in a big company as a C++ developer, we are using GIT. I'm going to make a ...
0
votes
1answer
77 views

Will changing published git history on a private repo cause problems when I make it public?

I have a github repo that is currently set to private. I'd like to make it public but before doing so would like to clean it up a little bit by squashing some commits and possibly rebasing so that the ...
0
votes
2answers
206 views

Best workflow for a web development team to work on a large amount of projects simultaneously? [duplicate]

We're a team of web developers, and as the number of projects we're working on has grown and continues to, things are starting to get messy. What we currently do is work on a locally shared folder ...
0
votes
1answer
133 views

Uploading Processing Sketch with library to github

I have a sketch I wrote in the language Processing that I want to put up on GitHub. It uses a library released under LGPL so from what I understand, I'm able to (and should) upload the library ...
0
votes
1answer
284 views

Repository strategy for multiple interconnected components with small differences

At my work we have multiple products.. productA, productB, ... these products reference multiple components. componentA, componentB.. there are also shared components sharedA, sharedB... etc.. which ...
0
votes
1answer
172 views

Tag and/or branch strategies for environments when using git

I've been researching git deployment flows and have seen many post-receive hooks that will check out master. Few of them however detail how you might set up a beta server that could be running any ...
0
votes
3answers
109 views

Something like “tracking” for local branches in git?

I often have a workflow where I develop some feature in a Git branch, switch to another feature-branch, etc. During development, the original develop branch and the feature branches diverge. Now when ...
0
votes
1answer
187 views

using pre-commit / post-merge hook script to replace configuration values

I'm having some problem developing a web application with various developers, each one has an specific configuration to work. and i would like to use the less resource cosuming approach to avoid that ...
0
votes
2answers
117 views

Distributing a data access solution across multiple solutions

I have 3 solutions, one of them is a dataccess solution with all the repositories etc. At the moment when a change is made to it, the others have to go get the latest nuget version locally, we have a ...
0
votes
1answer
158 views

External repository moved from Sourceforge (SVN) to GitHub, now what?

We've been getting the head revision of the JEDI Code library for a while, we only use it a tiny bit so never have bothered to manage which version we're getting. The problem is they appear to be ...
0
votes
2answers
148 views

How do I share different files in a git repo with different people?

In a single directory with a Git root folder, I have a bunch of files. I am working on one of those files, X.py, with my friend Alice. The other files I am working on with other people. I want Alice ...
0
votes
1answer
23 views

Sharing Project configuration files for an application with Qt IDE using Cmake and sharing via Git?

Imagine that you are starting to work in a project with a group of people. You want to share your code and the full configuration files of CMake, Qt IDE configuration. So you if you want to test or ...
0
votes
0answers
63 views

Working on the same file for two tickets

The company policy where I work is that code cannot be committed to SVN until a code review is complete. This is sensible enough as we don't want broken code ending up in the repo, but it does give us ...
0
votes
0answers
43 views

What is the purpose of 'Staging' in git [duplicate]

I have seen a lot of questions regarding 'staging' and their usages. I have seen this question and it answers only the what side and not the why side of the question. I know that staging means that ...
0
votes
0answers
39 views

What is a good directory structure for projects with versioned code but huge data files

We work with genomics and imaging data. Our data are large, but our code is small. We sometimes work on code collaboratively, and also wish to share it with the researchers we do analysis for. We are ...
0
votes
1answer
67 views

Managing a project on github in different repos or one? [duplicate]

An app I am working on (iOS) is being distributed to different businesses and each business needs a few customizations to said app before it is distributed to users on the app store. Most files will ...
0
votes
0answers
47 views

Workflow for maintaining a partially diverged fork

I work on a code base where I maintain a fork that is diverged from the upstream slightly. The project is about 5 million lines, and in general the developers and the users of a the code are the same ...
0
votes
0answers
54 views

What is the best way to handle two very similar projects with Git? [duplicate]

I am very new to Git (as in started last week to use it properly) and I have 2 projects. Project X and Project Y which is a fork of Project X with a lot of very slight modifications. What is the ...
0
votes
0answers
19 views

How to organize enterprise software in Git [duplicate]

I'm running into a conceptual design dilemma with our enterprise software. I'm hoping someone on here can help point me in the right direction. We have many different applications: Three Windows ...
0
votes
0answers
63 views

When should I start creating branches? [duplicate]

I am the only developer building a library. I have implemented many of the basic components, but the library itself is still useless until several other components have been built. So far, I have ...
0
votes
0answers
45 views

GIT repository layout for a Solution with multiple projects [duplicate]

I was a TFS User where we had a single Solution with multiple Projects and one developer can check out his project when they need. Also the Build system can do separate build for each Project or ...
0
votes
1answer
60 views

Making folder of a git repository a separate repository while preserving history

I have a generic git repository called Workspace and each project I have that isn't big enough to deserve its own repository is stored as a folder within it. One of my mini-projects is now big enough ...
0
votes
1answer
97 views

PHP and Subversion workflow [duplicate]

I'm working on a project in a small team at the moment working on a webapp. We originally had 3 on the team with a lead dev and now we've grown to 7 and a lead dev. At the moment our workflow is ...
0
votes
0answers
18 views

What is a good frequency for merging up feature branches to a main line? [duplicate]

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
2answers
57 views

VCS - Better way to change location than pushing to branch?

I work from multiple locations quite frequently, and there's times (16:59 on a Friday for example) when I need to leave quickly with potentially unstable code. Right now I tend to commit and push the ...
0
votes
0answers
93 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
5k 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
550 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
-1
votes
4answers
252 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 ...
-1
votes
2answers
2k views

Will git whine if I create my projects in multiple directories? [closed]

I'm new to git (and github). I work in Java and Python. Right now, I manage my projects in only one directory - let's call it Code and the folder is on my Desktop. I want to group my projects by the ...
-1
votes
1answer
417 views

How to maintain lots of different variations for deployment, using Git for development

Although there are many similar questions here regarding using GIT for maintaining different versions, none seem to answer my specific case. I'm OK with how to use GIT to do my development, using ...
-1
votes
1answer
590 views

Best practices in managing nuget repositories [closed]

I've been involved in a project using Visual Studio 2012 that has multiple solutions and multiple projects. In most cases, one solution will have to refer to the library build in a different project. ...
-1
votes
1answer
141 views

How do front-end developers test pages when the files they are handed are PHP views? [closed]

Someone who has a PHP project invited me to do the front-end work on his site. I don't know PHP, I've only ever worked with HTML/CSS/JS files. I cloned the project files from GitHub, and all of the ...
-1
votes
1answer
829 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 ...
-1
votes
0answers
8 views

Update Fork from master problems

I'm currently contributing to an OpenSource Project on GitHub. The problem I currently have, is that every time a PR was merged, when trying to update my fork, it will show for example "this branch is ...
-1
votes
1answer
53 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 ...