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

learn more… | top users | synonyms

5
votes
4answers
216 views

How to determine when to open a new branch or a new repository when using Git?

Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
6
votes
3answers
113 views

Do we need to create local branches for the enhancements we are working on?

We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
1
vote
1answer
132 views

Fork Management of Git Multi-level Hierarchies

We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
6
votes
1answer
126 views

Merge bug fixes from trunk in old branches

We are now in the process of switching from svn to git (after a year spent on convincing people, yay!) in my company. So far, this is all for the better but there is one little thing that we ...
0
votes
2answers
79 views

Is it better to start a Pull Request or perform a local merge commit on master?

I have been using GitHub for quite some time now and I usually used to push my feature-branches and then start a Pull Request which I myself merged. I found it helped me keep track of where I merged ...
0
votes
2answers
206 views

If you decide that branching is a bad thing, then why use Git over SVN? [closed]

I have used Git and Mercurial a bit over the past ten years and appreciate and prefer them, but most of my experience is with SVN. If it is decided within a corporate programming group that branching ...
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 ...
4
votes
0answers
392 views

Keeping a permanent git fork updated [closed]

Please consider the following scenario: There is an npm package named some-package. There are a couple dozen known dependent npm packages that all depend on some-package. I forked some-package and ...
7
votes
2answers
502 views

Should collaborators on a private Github repository each fork the repo?

I'm working on a project at the moment, and we have the source code up in a private repository on Github, with each of us as a collaborator. What we are unclear on is how to separate each of our ...
1
vote
2answers
111 views

How to make git automatically merge increased build numbers? [closed]

I like having build numbers, just because it is cool. Please don't judge me :D. However, I develop on two machines (one OS X and one Windows for portability checks). I have on both machines a script ...
12
votes
2answers
261 views

Workflow, editing things not in your current task

Usually when I program, I have a clear task ahead of me, but find annoying things I'd like to clean up as I go on. Here I see three options: Do it later (may forgot/have to spend time adding a ...
2
votes
2answers
469 views

Making major version step in software development in separate repository [duplicate]

Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
5
votes
0answers
62 views

Restructuring SVN repo for migrating to git [duplicate]

We currently have a SVN repo structured like so /trunk/library/libA /libB /libC . . /trunk/tools/toolA /toolB . ...
13
votes
2answers
285 views

How to handle it when a commit in-progress suddenly appears to depend on another that isn't there yet?

I'm inexperienced with Git but I try my best to get used to it, and so far I'm just using it for projects I work on alone. When I code there's some top-down approach naturally (as I can't know the ...
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 ...
23
votes
6answers
834 views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
2
votes
2answers
90 views

Create separate GIT repository for publishing with different history?

I'm developing a project, which I'm pushing to private repository on my VPS. However, I'd like to publish it on GitHub. I make a lot of commits(mostly as backups) which doesn't contain complete ...
118
votes
9answers
10k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
12
votes
3answers
462 views

How can we keep track of which version of our code is in each environment?

My team currently uses a fairly simple branching/deployment process that looks like this: ┌────────┐ ┌────┐ ┌──────┐ Environments: │ DEV │ │ QA │ │ PROD │ ...
3
votes
2answers
276 views

Should we include Nuget PACKAGE folder in version control?

I would like to know In C# or VB.NET project should we include the PACKAGE folder (nugget package folder that is created to the root of my project that contain the nupkg files and other content) to ...
17
votes
4answers
2k views

Why is the Git .git/objects/ folder subdivided in many SHA-prefix folders?

Git internally stores objects (Blobs, trees) in the .git/objects/ folder. Each object can be referenced by a SHA1 hash that is computed from the contents of the object. However, Objects are not ...
2
votes
0answers
83 views

Justification for different code bases on different branches in the same repo? [closed]

Branches in git repos or similar are practically always derived from the same code base; after all, they're usually merged back in to master later. But, if you wanted your open source project on ...
1
vote
0answers
105 views

Git Repositories updated

I would like to keep two Git repositories updated. First one, is GitHub open source project that gets updated frequently. Second one is a private held Git Repo located other than GitHub. This one ...
2
votes
2answers
86 views

Bugs showing up with merge on the release branch

When trying to follow the the gitflow model, we have a branch for the releases. However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from ...
6
votes
1answer
226 views

Git branching from a feature branch to work on a subfeature

We're currently in the following situation, where a feature branch has been branched for a sub-feature branch (like, working on backend and frontend things for the same feature): o | o development ...
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 ...
3
votes
1answer
204 views

What does k stand for in gitk? [closed]

I wonder k must mean something in gitk. Could not find it on Google. Found that git was named by Linus Torvalds out of imagination. But when a tool was added with name gitk, there must be something ...
-2
votes
2answers
117 views

When to really use a branch in git? [closed]

I have automated a few test cases and pushed them for review. However I need to continue developing other testcases in the same code. I cannot create a new sandbox everytime as my changes are not ...
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 ...
1
vote
1answer
144 views

Why use `stash@{n}`?

git stash apply stash@{n} contains a number of hard to type characters and repeats some information. Is there a reason for repeating the stash and using the at-sign and braces instead of something ...
0
votes
1answer
86 views

Development environment for lots of websites with Git

I have 5 different websites that use exactly the same code, apart from they have an uploads folder with different contents (AKA images that aren't consistent through every site) and also a config file ...
4
votes
1answer
96 views

Code licensing injection and version control history

Are there licensing ramifications to having GPLed code in a public git history, but not a released version of the distributed software? Could a repo owner be obliged to changing their licensing ...
1
vote
3answers
158 views

Git repo with lots of medium-sized images?

I've just used git-tfs to checkout a TFS repo into a Git repo. The .git directory comes to 2.33GiB, and the primary reason for this is a couple of large directories coming to about 650MiB each. Each ...
43
votes
3answers
4k views

What happens if a feature merged into develop is postponed by management?

We recently had a problem whereby a feature for our webapp (automatic signup) was postponed by management because they felt the start was too "cold" but they wanted all the other features we had been ...
4
votes
2answers
172 views

Squashing commits from multiple developers into a single commit

I work in a large software development group and we've recently made the switch from Clearcase to Git. Some predictions have been made with regard to the quality of the mainline in that it would ...
24
votes
7answers
4k views

Automatically reverting commits that fail the build

A colleague of mine told me that he is thinking in making our CI server to revert commits that failed the build, so the HEAD in master is always stable (as in passing the build at least). Is this a ...
1
vote
0answers
46 views

One or multiple visual studio solutions for all my projects [duplicate]

Admittedly that's a bad title, but the full title would be far too long. To give some context. I volunteer at a charity where I maintain a MSSQL Database and an MS Access client application and I'm ...
3
votes
1answer
102 views

Merging from unfinished feature branches and code review

We are using the git flow workflow, and it sometimes happens that we have long-lived feature branches. Of course we can merge from the develop branch into our feature branch, when another feature ...
1
vote
1answer
63 views

How to decide git repo division with workflow considerations?

We are moving from subversion to git for branching and distributed development reasons. One struggle in the past with our old repository workflow was that every application had its own repository. A ...
-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 ...
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 ...
1
vote
1answer
59 views

What's the proper way to organize and revision a pull request

I'm working on an open source project for the first time and I'm adding a feature to the source. The way I've been going about, is I've squashed my individual commits into on clean commit for the ...
1
vote
1answer
95 views

Git Question: What to do when multiple people working on a project?

I made a project and put it on github, it's basically a small powershell function that is pretty useful in some situations. I've since made some improvements to it to add functionality...but someone ...
6
votes
1answer
159 views

Introducing Pull Requests for a 2 person team - merge my own requests?

I'm introducing git to a junior team member (a co-op). They are comfortable now with the basics of adding, committing, pushing and pulling. Now I want to introduce them to pull requests and ...
1
vote
1answer
132 views

How to handle a project in git with the same code but different templates?

I have a project where the only difference are the templates. The question is how should I manage this with git now? At the moment I have 3 different git Repos, but it's hard to maintain all 3 of ...
4
votes
1answer
185 views

What would happen if two different commits in one git repo had the same hash?

I know this has been said to be pretty much statistically impossible but that's a different question. What would be the consequences if against all odds, this did occur?
1
vote
1answer
114 views

Development Workflow (Git/CI) in varied tech level .NET Shop

tl;dr: I need a development workflow for ASP.NET apps that works for the designer on a Mac, the content writers who don't have visual studio, and the C#/.NET developers (mostly me), such that we can ...
2
votes
2answers
193 views

“Party on my branch” workflow support in mercurial

When I'm on a git project, I have a workflow that goes something like this: Start a new feature (open a new branch) Write some code, commit some code, repeat Push the code to a remote, possibly with ...
2
votes
1answer
116 views

Avoid branch conflicts/race conditions with task branches

Background Support and Sprint are the test branches for bugs and tasks Each bug gets a new branch from master, which is merged into Support, when tested good, a pull request is made between the ...
0
votes
1answer
62 views

Average commits per merge to Master using gitflow [closed]

I'm currently working alone on a project, but I still use Git since it is a really powerful tool. I use gitflow workflow methodology, and today I have merged to master with 77 commits. I was surprised ...